Merge remote-tracking branch 'origin' into specify-zookeeper-version

Altinity · May 16, 2024 · 6b1408b · 6b1408b
2 parents eacf0aa + 4458e2e
commit 6b1408b
Show file tree

Hide file tree

Showing 620 changed files with 1,529,817 additions and 5,413 deletions.
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
@@ -46,6 +46,8 @@ Table of which suites rely on what docker images.
 || zookeeper:3.8.4 |
 | base_58 | clickhouse/clickhouse-integration-test:28741 |
 || zookeeper:3.8.4 |
+| base_58 | altinityinfra/clickhouse-regression-multiarch:1.0 |
+|| zookeeper:3.8.2 |
 | clickhouse/functional | altinityinfra/clickhouse-functional-test:1.0 |
 || bitnami/zookeeper:3.7.1-debian-11-r90 |
 | clickhouse_keeper | altinityinfra/clickhouse-regression-multiarch:1.0 |
@@ -75,9 +77,19 @@ Table of which suites rely on what docker images.
 || zookeeper:3.4.12 |
 | kerberos | altinityinfra/clickhouse-regression-multiarch:1.0 |
 || altinityinfra/docker-krb5-server:1.0 |
+<<<<<<< HEAD
 || zookeeper:3.8.4 |
 | key_value | clickhouse/clickhouse-integration-test:28741 |
 || zookeeper:3.8.4 |
+||||||| f18dee1e
+|| zookeeper:3.6.2 |
+| key_value | clickhouse/clickhouse-integration-test:28741 |
+|| zookeeper:3.6.2 |
+=======
+|| zookeeper:3.6.2 |
+| key_value | altinityinfra/clickhouse-regression-multiarch:1.0 |
+|| zookeeper:3.6.2 |
+>>>>>>> origin
 | ldap | altinityinfra/clickhouse-regression-multiarch:1.0 |
 || osixia/openldap:1.4.0 |
 || zookeeper:3.8.4 |

diff --git a/.github/workflows/run-alter-stress.yml b/.github/workflows/run-alter-stress.yml
@@ -17,15 +17,20 @@ on:
         type: choice
         options:
           - safe
-          - add-remove-replicas
-          - full-disk
-          - network-faults
-          - insert-faults
+          - columns
+          - columns and indexes
+          - indexes and projections
+          - add remove replicas
+          - restarts
+          - full disk
+          - network faults
+          - insert faults
       storage_provider:
         description: "Storage Provider to use (default: minio)"
         type: choice
         options:
           - minio
+          - local
           - aws_s3
           - gcs
           - all
@@ -89,7 +94,7 @@ env:
     --attr project="${GITHUB_REPOSITORY}" project.id="${GITHUB_REPOSITORY_ID}" user.name="${GITHUB_ACTOR}" version="${{ inputs.version }}" package="${{ inputs.package }}" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="${GITHUB_SHA}" job.id="${GITHUB_RUN_ID}" job.url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" arch="$(uname -i)"
     --log raw.log ${{ inputs.extra_args }}
     --stress
-    --only ":/alter/:/${{ inputs.scenario }}*"
+    --only ":/combinations/:/${{ inputs.scenario }}*"
   artifact_paths: |
     ./report.html
     ./*.log.txt
@@ -136,7 +141,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: alter-stress-aws-artifacts
+          name: alter-stress-aws-x86-artifacts
           path: ${{ env.artifact_paths}}
 
   alter_stress_gcs_x86:
@@ -173,7 +178,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: alter-stress-gcs-artifacts
+          name: alter-stress-gcs-x86-artifacts
           path: ${{ env.artifact_paths}}
 
   alter_stress_minio_x86:
@@ -207,7 +212,41 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: alter-stress-minio-artifacts
+          name: alter-stress-minio-x86-artifacts
+          path: ${{ env.artifact_paths}}
+
+  alter_stress_local_x86:
+    runs-on: [self-hosted, type-cpx51, image-x86-app-docker-ce]
+    timeout-minutes: 10000
+    env:
+      SUITE: alter/stress
+      STORAGE: /local_x86
+    if: ${{ contains('all local', inputs.storage_provider) && contains('all x86', inputs.architecture) }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.ref }}
+
+      - name: Setup
+        run: .github/setup.sh
+
+      - name: Run ${{ env.SUITE }} suite
+        run: python3
+              -u ${{ env.SUITE }}/regression.py
+              --storage local
+              --clickhouse-binary-path ${{ env.clickhouse_binary_path }}
+              --clickhouse-version ${{ env.version }}
+              ${{ env.args }}
+
+      - name: Create and upload logs
+        if: always()
+        run: .github/create_and_upload_logs.sh ${{ vars.UPLOAD_LOGS }}
+
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: alter-stress-local-x86-artifacts
           path: ${{ env.artifact_paths}}
 
   alter_stress_aws_arm:
@@ -245,7 +284,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: alter-stress-aws-artifacts
+          name: alter-stress-aws-arm-artifacts
           path: ${{ env.artifact_paths}}
 
   alter_stress_gcs_arm:
@@ -282,7 +321,7 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: alter-stress-gcs-artifacts
+          name: alter-stress-gcs-arm-artifacts
           path: ${{ env.artifact_paths}}
 
   alter_stress_minio_arm:
@@ -316,5 +355,39 @@ jobs:
       - uses: actions/upload-artifact@v3
         if: always()
         with:
-          name: alter-stress-minio-artifacts
+          name: alter-stress-minio-arm-artifacts
+          path: ${{ env.artifact_paths}}
+
+  alter_stress_local_arm:
+    runs-on: [self-hosted, type-cax41, image-arm-app-docker-ce]
+    timeout-minutes: 10000
+    env:
+      SUITE: alter/stress
+      STORAGE: /local_arm
+    if: ${{ contains('all local', inputs.storage_provider) && contains('all ARM', inputs.architecture) }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.ref }}
+
+      - name: Setup
+        run: .github/setup.sh
+
+      - name: Run ${{ env.SUITE }} suite
+        run: python3
+              -u ${{ env.SUITE }}/regression.py
+              --storage local
+              --clickhouse-binary-path ${{ env.clickhouse_binary_path }}
+              --clickhouse-version ${{ env.version }}
+              ${{ env.args }}
+
+      - name: Create and upload logs
+        if: always()
+        run: .github/create_and_upload_logs.sh ${{ vars.UPLOAD_LOGS }}
+
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: alter-stress-local-arm-artifacts
           path: ${{ env.artifact_paths}}
diff --git a/.github/workflows/run-arm-regression.yml b/.github/workflows/run-arm-regression.yml
@@ -65,10 +65,6 @@ on:
           - tiered_storage_gcs
           - tiered_storage_local
           - tiered_storage_minio
-          - vfs_all
-          - vfs_aws
-          - vfs_gcs
-          - vfs_minio
           - window_functions
       artifacts:
         description: "Artifact S3 bucket"
@@ -1656,115 +1652,6 @@ jobs:
           name: ${{ env.SUITE }}-minio-artifacts
           path: ${{ env.artifact_paths}}
 
-  vfs_aws:
-    runs-on: [self-hosted, type-cax41, image-arm-app-docker-ce]
-    timeout-minutes: 300
-    env:
-      SUITE: vfs
-      STORAGE: /aws
-    if: ${{ inputs.suite == 'vfs_aws' || inputs.suite == 'vfs_all' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.ref }}
-
-      - name: Setup
-        run: .github/setup.sh
-
-      - name: Run ${{ env.SUITE }} suite
-        run: python3
-              -u ${{ env.SUITE }}/regression.py
-              --storage aws_s3
-              --aws-s3-bucket ${{ secrets.AWS_BUCKET }}
-              --aws-s3-region ${{ secrets.AWS_REGION }}
-              --aws-s3-key-id ${{ secrets.AWS_KEY_ID }}
-              --aws-s3-access-key ${{ secrets.AWS_ACCESS_KEY }}
-              --clickhouse-binary-path ${{ env.clickhouse_binary_path }}
-              --clickhouse-version ${{ env.version }}
-              ${{ env.args }}
-
-      - name: Create and upload logs
-        if: always()
-        run: .github/create_and_upload_logs.sh ${{ vars.UPLOAD_LOGS }}
-
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: ${{ env.SUITE }}-aws-artifacts
-          path: ${{ env.artifact_paths}}
-
-  vfs_gcs:
-    runs-on: [self-hosted, type-cax41, image-arm-app-docker-ce]
-    timeout-minutes: 300
-    env:
-      SUITE: vfs
-      STORAGE: /gcs
-    if: ${{ inputs.suite == 'vfs_gcs' || inputs.suite == 'vfs_all' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.ref }}
-
-      - name: Setup
-        run: .github/setup.sh
-
-      - name: Run ${{ env.SUITE }} suite
-        run: python3
-              -u ${{ env.SUITE }}/regression.py
-              --storage gcs
-              --gcs-uri ${{ secrets.GCS_URI }}
-              --gcs-key-id ${{ secrets.GCS_KEY_ID }}
-              --gcs-key-secret ${{ secrets.GCS_KEY_SECRET }}
-              --clickhouse-binary-path ${{ env.clickhouse_binary_path }}
-              --clickhouse-version ${{ env.version }}
-              ${{ env.args }}
-
-      - name: Create and upload logs
-        if: always()
-        run: .github/create_and_upload_logs.sh ${{ vars.UPLOAD_LOGS }}
-
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: ${{ env.SUITE }}-gcs-artifacts
-          path: ${{ env.artifact_paths}}
-
-  vfs_minio:
-    runs-on: [self-hosted, type-cax41, image-arm-app-docker-ce]
-    timeout-minutes: 300
-    env:
-      SUITE: vfs
-      STORAGE: /minio
-    if: ${{ inputs.suite == 'vfs_all' || inputs.suite == 'vfs_minio' }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.ref }}
-
-      - name: Setup
-        run: .github/setup.sh
-
-      - name: Run ${{ env.SUITE }} suite
-        run: python3
-              -u ${{ env.SUITE }}/regression.py
-              --storage minio
-              --clickhouse-binary-path ${{ env.clickhouse_binary_path }}
-              --clickhouse-version ${{ env.version }}
-              ${{ env.args }}
-
-      - name: Create and upload logs
-        if: always()
-        run: .github/create_and_upload_logs.sh ${{ vars.UPLOAD_LOGS }}
-
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: ${{ env.SUITE }}-minio-artifacts
-          path: ${{ env.artifact_paths}}
-
   window_functions:
     runs-on: [self-hosted, type-cax41, image-arm-app-docker-ce]
     timeout-minutes: 180