Merge remote-tracking branch 'remotes/clickhouse/master' into sevirov…

…-DOCSUP-14783-document_the_mysql_settings
twalwyn · Nov 25, 2021 · 54ca7d7 · 54ca7d7
2 parents 94d43d9 + 55b9724
commit 54ca7d7
Show file tree

Hide file tree

Showing 594 changed files with 17,304 additions and 3,268 deletions.
diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
@@ -1,7 +1,7 @@
 name: Cancel
 on: # yamllint disable-line rule:truthy
   workflow_run:
-    workflows: ["CIGithubActions"]
+    workflows: ["CIGithubActions", "ReleaseCI"]
     types:
       - requested
 jobs:

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -152,7 +152,7 @@ jobs:
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
           cp -r $GITHUB_WORKSPACE $TEMP_PATH
-          cd $REPO_COPY/tests/ci && python3 compatibility_check.py 0
+          cd $REPO_COPY/tests/ci && python3 compatibility_check.py
       - name: Cleanup
         if: always()
         run: |
@@ -250,7 +250,7 @@ jobs:
           REPO_COPY: ${{runner.temp}}/build_check/ClickHouse
           CACHES_PATH: ${{runner.temp}}/../ccaches
           CHECK_NAME: 'ClickHouse build check (actions)'
-          BUILD_NUMBER: 9
+          BUILD_NUMBER: 8
         run: |
           sudo rm -fr $TEMP_PATH
           mkdir -p $TEMP_PATH
@@ -518,6 +518,7 @@ jobs:
       - BuilderDebDebug
       - BuilderDebSplitted
     runs-on: [self-hosted, style-checker]
+    if: always()
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -604,7 +605,9 @@ jobs:
           sudo rm -fr $TEMP_PATH
   FunctionalStatelessTestTsan:
     needs: [BuilderDebTsan]
-    runs-on: [self-hosted, func-tester]
+    # tests can consume more than 60GB of memory,
+    # so use bigger server
+    runs-on: [self-hosted, stress-tester]
     steps:
       - name: Download json reports
         uses: actions/download-artifact@v2
@@ -1297,6 +1300,34 @@ jobs:
           docker kill $(docker ps -q) ||:
           docker rm -f $(docker ps -a -q) ||:
           sudo rm -fr $TEMP_PATH
+  IntegrationTestsFlakyCheck:
+    needs: [BuilderDebAsan]
+    runs-on: [self-hosted, stress-tester]
+    steps:
+      - name: Download json reports
+        uses: actions/download-artifact@v2
+        with:
+          path: ${{runner.temp}}/reports_dir
+      - name: Check out repository code
+        uses: actions/checkout@v2
+      - name: Integration test
+        env:
+          TEMP_PATH: ${{runner.temp}}/integration_tests_asan_flaky_check
+          REPORTS_PATH: ${{runner.temp}}/reports_dir
+          CHECK_NAME: 'Integration tests flaky check (asan, actions)'
+          REPO_COPY: ${{runner.temp}}/integration_tests_asan_flaky_check/ClickHouse
+        run: |
+          sudo rm -fr $TEMP_PATH
+          mkdir -p $TEMP_PATH
+          cp -r $GITHUB_WORKSPACE $TEMP_PATH
+          cd $REPO_COPY/tests/ci
+          python3 integration_test_check.py "$CHECK_NAME"
+      - name: Cleanup
+        if: always()
+        run: |
+          docker kill $(docker ps -q) ||:
+          docker rm -f $(docker ps -a -q) ||:
+          sudo rm -fr $TEMP_PATH
 #############################################################################################
 #################################### UNIT TESTS #############################################
 #############################################################################################
@@ -1426,7 +1457,7 @@ jobs:
         env:
           TEMP_PATH: ${{runner.temp}}/unit_tests_ubsan
           REPORTS_PATH: ${{runner.temp}}/reports_dir
-          CHECK_NAME: 'Unit tests (msan, actions)'
+          CHECK_NAME: 'Unit tests (ubsan, actions)'
           REPO_COPY: ${{runner.temp}}/unit_tests_ubsan/ClickHouse
         run: |
           sudo rm -fr $TEMP_PATH
@@ -1481,6 +1512,7 @@ jobs:
       - UnitTestsReleaseClang
       - SplitBuildSmokeTest
       - CompatibilityCheck
+      - IntegrationTestsFlakyCheck
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Check out repository code