From a4016d4b3541a08c2e026697e3dd06e808f050d8 Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Thu, 16 May 2024 00:06:56 -0700
Subject: [PATCH 1/9] Update release_branches.yml

---
 .github/workflows/release_branches.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index ec89c8b5400a..217b3490a164 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -26,6 +26,8 @@ on: # yamllint disable-line rule:truthy
   push:
     branches:
       - 'releases/23.3**'
+  schedule:
+    - cron: "0 0 * * 6"
 
 jobs:
   DockerHubPushAarch64:

From 26d4893dbcb118a4ef0f8e890492bfc494e3a3ed Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Mon, 20 May 2024 09:49:22 -0700
Subject: [PATCH 2/9] Update release_branches.yml

---
 .github/workflows/release_branches.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index 217b3490a164..f4b44b108ccd 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -43,7 +43,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 docker_images_check.py --suffix aarch64
       - name: Upload images files to artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: changed_images_aarch64
           path: ${{ runner.temp }}/docker_images_check/changed_images_aarch64.json
@@ -61,7 +61,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 docker_images_check.py --suffix amd64
       - name: Upload images files to artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: changed_images_amd64
           path: ${{ runner.temp }}/docker_images_check/changed_images_amd64.json
@@ -84,13 +84,13 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Download changed aarch64 images
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: changed_images_aarch64
           path: ${{ runner.temp }}
 
       - name: Download changed amd64 images
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: changed_images_amd64
           path: ${{ runner.temp }}
@@ -101,7 +101,7 @@ jobs:
           python3 docker_manifests_merge.py --suffix amd64 --suffix aarch64
 
       - name: Upload images files to artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: changed_images
           path: ${{ runner.temp }}/changed_images.json
@@ -657,9 +657,9 @@ jobs:
         run: |
           sudo rm -fr "$GITHUB_WORKSPACE" && mkdir "$GITHUB_WORKSPACE"
       - name: Check out repository code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Download json reports
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.REPORTS_PATH }}
       - name: Sign release
@@ -671,7 +671,7 @@ jobs:
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 sign_release.py
       - name: Upload signed hashes
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: signed-hashes
           path: ${{ env.TEMP_PATH }}/*.gpg

From df613ccb59d73ea006d2b4599eb959ded7610660 Mon Sep 17 00:00:00 2001
From: MyroTk <myroslav6@gmail.com>
Date: Mon, 20 May 2024 09:54:55 -0700
Subject: [PATCH 3/9] use v4 actions

---
 .github/workflows/regression.yml     | 48 ++++++++++++++--------------
 .github/workflows/reusable_build.yml |  6 ++--
 .github/workflows/reusable_test.yml  |  2 +-
 3 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index d8f68a513f41..f97ef2a1e295 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -147,7 +147,7 @@ jobs:
     timeout-minutes: ${{ inputs.timeout_minutes }}
     steps:
       - name: Checkout regression repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: Altinity/clickhouse-regression
           ref: ${{ inputs.commit }}
@@ -158,7 +158,7 @@ jobs:
           SUITE=${{ matrix.SUITE }}
           EOF
       - name: Download json reports
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.REPORTS_PATH }}
           name: build_report_package_${{ inputs.arch }}
@@ -175,7 +175,7 @@ jobs:
       - name: Create and upload logs
         if: always()
         run: .github/create_and_upload_logs.sh 1
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ${{ env.SUITE }}-${{ inputs.arch }}-artifacts
@@ -191,7 +191,7 @@ jobs:
     timeout-minutes: ${{ inputs.timeout_minutes }}
     steps:
       - name: Checkout regression repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: Altinity/clickhouse-regression
           ref: ${{ inputs.commit }}
@@ -203,7 +203,7 @@ jobs:
           STORAGE=/${{ matrix.STORAGE }}
           EOF
       - name: Download json reports
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.REPORTS_PATH }}
           name: build_report_package_${{ inputs.arch }}
@@ -228,7 +228,7 @@ jobs:
       - name: Create and upload logs
         if: always()
         run: .github/create_and_upload_logs.sh 1
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: benchmark-${{ matrix.STORAGE }}-${{ inputs.arch }}-artifacts
@@ -240,7 +240,7 @@ jobs:
     timeout-minutes: ${{ inputs.timeout_minutes }}
     steps:
       - name: Checkout regression repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: Altinity/clickhouse-regression
           ref: ${{ inputs.commit }}
@@ -252,7 +252,7 @@ jobs:
           STORAGE=/ssl
           EOF
       - name: Download json reports
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.REPORTS_PATH }}
           name: build_report_package_${{ inputs.arch }}
@@ -270,7 +270,7 @@ jobs:
       - name: Create and upload logs
         if: always()
         run: .github/create_and_upload_logs.sh 1
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ${{ env.SUITE }}-${{ inputs.arch }}-ssl-artifacts
@@ -286,7 +286,7 @@ jobs:
     timeout-minutes: ${{ inputs.timeout_minutes }}
     steps:
       - name: Checkout regression repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: Altinity/clickhouse-regression
           ref: ${{ inputs.commit }}
@@ -297,7 +297,7 @@ jobs:
           SUITE=ldap/${{ matrix.SUITE }}
           EOF
       - name: Download json reports
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.REPORTS_PATH }}
           name: build_report_package_${{ inputs.arch }}
@@ -314,7 +314,7 @@ jobs:
       - name: Create and upload logs
         if: always()
         run: .github/create_and_upload_logs.sh 1
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ldap-${{ matrix.SUITE }}-${{ inputs.arch }}-artifacts
@@ -326,7 +326,7 @@ jobs:
     timeout-minutes: ${{ inputs.timeout_minutes }}
     steps:
       - name: Checkout regression repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: Altinity/clickhouse-regression
           ref: ${{ inputs.commit }}
@@ -337,7 +337,7 @@ jobs:
           SUITE=parquet
           EOF
       - name: Download json reports
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.REPORTS_PATH }}
           name: build_report_package_${{ inputs.arch }}
@@ -354,7 +354,7 @@ jobs:
       - name: Create and upload logs
         if: always()
         run: .github/create_and_upload_logs.sh 1
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ${{ env.SUITE }}-${{ inputs.arch }}-artifacts
@@ -370,7 +370,7 @@ jobs:
     timeout-minutes: ${{ inputs.timeout_minutes }}
     steps:
       - name: Checkout regression repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: Altinity/clickhouse-regression
           ref: ${{ inputs.commit }}
@@ -382,7 +382,7 @@ jobs:
           STORAGE=${{ matrix.STORAGE}}
           EOF
       - name: Download json reports
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.REPORTS_PATH }}
           name: build_report_package_${{ inputs.arch }}
@@ -404,7 +404,7 @@ jobs:
       - name: Create and upload logs
         if: always()
         run: .github/create_and_upload_logs.sh 1
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ${{ env.SUITE }}-${{ env.STORAGE }}-${{ inputs.arch }}-artifacts
@@ -420,7 +420,7 @@ jobs:
     timeout-minutes: ${{ inputs.timeout_minutes }}
     steps:
       - name: Checkout regression repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: Altinity/clickhouse-regression
           ref: ${{ inputs.commit }}
@@ -432,7 +432,7 @@ jobs:
           STORAGE=/${{ matrix.STORAGE }}
           EOF
       - name: Download json reports
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.REPORTS_PATH }}
           name: build_report_package_${{ inputs.arch }}
@@ -457,7 +457,7 @@ jobs:
       - name: Create and upload logs
         if: always()
         run: .github/create_and_upload_logs.sh 1
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ${{ env.SUITE }}-${{ matrix.STORAGE }}-${{ inputs.arch }}-artifacts
@@ -473,7 +473,7 @@ jobs:
     timeout-minutes: ${{ inputs.timeout_minutes }}
     steps:
       - name: Checkout regression repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: Altinity/clickhouse-regression
       - name: Set envs
@@ -484,7 +484,7 @@ jobs:
           STORAGE=/${{ matrix.STORAGE }}
           EOF
       - name: Download json reports
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.REPORTS_PATH }}
           name: build_report_package_${{ inputs.arch }}
@@ -508,7 +508,7 @@ jobs:
       - name: Create and upload logs
         if: always()
         run: .github/create_and_upload_logs.sh 1
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: ${{ env.SUITE }}-${{ matrix.STORAGE }}-${{ inputs.arch }}-artifacts
diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml
index 01dc27577974..aeff0d678941 100644
--- a/.github/workflows/reusable_build.yml
+++ b/.github/workflows/reusable_build.yml
@@ -131,7 +131,7 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Download changed images
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: changed_images
           path: ${{ env.IMAGES_PATH }}
@@ -141,14 +141,14 @@ jobs:
           mkdir -p "$TEMP_PATH/build_check/package_release"
           cd .. && tar czf $TEMP_PATH/build_source.src.tar.gz ClickHouse/
           cd $TEMP_PATH && tar xvzf $TEMP_PATH/build_source.src.tar.gz
-          
+
       - name: Build
         run: |
           cd "$REPO_COPY/tests/ci" && python3 build_check.py "$BUILD_NAME"
 
       - name: Upload build URLs to artifacts
         if: ${{ success() || failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.BUILD_URLS }}
           path: ${{ env.TEMP_PATH }}/${{ env.BUILD_URLS }}.json
diff --git a/.github/workflows/reusable_test.yml b/.github/workflows/reusable_test.yml
index c20f32bc9f88..d2d0bcc38248 100644
--- a/.github/workflows/reusable_test.yml
+++ b/.github/workflows/reusable_test.yml
@@ -155,7 +155,7 @@ jobs:
           job_type: test
 
       - name: Download json reports
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: ${{ env.REPORTS_PATH }}
 

From 205a7c75e07ac3324fe0673121017da485190e18 Mon Sep 17 00:00:00 2001
From: MyroTk <myroslav6@gmail.com>
Date: Wed, 22 May 2024 05:14:45 -0700
Subject: [PATCH 4/9] introduce smaller runners for light jobs, and artifacts
 cleanup

---
 .github/workflows/release_branches.yml | 16 +++++++++-------
 .github/workflows/reusable_build.yml   |  8 --------
 .github/workflows/reusable_test.yml    |  9 +--------
 3 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index f4b44b108ccd..ee3bda324385 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -112,7 +112,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Compatibility check X86
-      runner_type: altinity-on-demand, altinity-type-cpx41, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce
       timeout_minutes: 180
       run_command: |
         cd "$REPO_COPY/tests/ci"
@@ -125,6 +125,7 @@ jobs:
     with:
       test_name: Compatibility check Aarch64
       runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-app-docker-ce
+      timeout_minutes: 180
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
@@ -259,7 +260,7 @@ jobs:
     secrets: inherit
     with:
       test_name: ClickHouse build check
-      runner_type: altinity-on-demand, altinity-type-cpx41, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-x86-app-docker-ce
       timeout_minutes: 180
       additional_envs: |
         NEEDS_DATA<<NDENV
@@ -276,7 +277,7 @@ jobs:
       - BuilderDebRelease
       - BuilderDebAarch64
       - SignRelease
-    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx41, altinity-image-x86-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-x86-app-docker-ce]
     timeout-minutes: 180
     steps:
       - name: Check out repository code
@@ -630,7 +631,7 @@ jobs:
       runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce, altinity-setup-regression
       commit: 6da94b78dc53cb8965ab56c04a89ebf54ed04cbc
       arch: release 
-      build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.event_name == 'release' && github.sha }}
+      build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
   RegressionTestsAarch64:
     needs: [BuilderReport]
@@ -640,11 +641,11 @@ jobs:
       runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-app-docker-ce, altinity-setup-regression
       commit: 6da94b78dc53cb8965ab56c04a89ebf54ed04cbc
       arch: aarch64
-      build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.event_name == 'release' && github.sha }}
+      build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
   SignRelease:
     needs: [BuilderDebRelease]
-    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx41, altinity-in-ash, altinity-image-x86-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-in-ash, altinity-image-x86-app-docker-ce]
     timeout-minutes: 180
     steps:
       - name: Set envs
@@ -661,6 +662,7 @@ jobs:
       - name: Download json reports
         uses: actions/download-artifact@v4
         with:
+          pattern: build_report_package_*
           path: ${{ env.REPORTS_PATH }}
       - name: Sign release
         env:
@@ -718,7 +720,7 @@ jobs:
       - RegressionTestsRelease
       - RegressionTestsAarch64
       - SignRelease
-    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx31, altinity-image-x86-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-x86-app-docker-ce]
     steps:
       - name: Check out repository code
         uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml
index aeff0d678941..aca556d0a405 100644
--- a/.github/workflows/reusable_build.yml
+++ b/.github/workflows/reusable_build.yml
@@ -35,12 +35,6 @@ name: Build ClickHouse
       AWS_DEFAULT_REGION:
         description: the region of the aws param store.
         required: true
-      DOCKER_USERNAME:
-        description: username of the docker user.
-        required: true
-      DOCKER_PASSWORD:
-        description: password to the docker user.
-        required: true
 
 env:
   # Force the stdout and stderr streams to be unbuffered
@@ -48,8 +42,6 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
-  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
   runner_labels_setup:
diff --git a/.github/workflows/reusable_test.yml b/.github/workflows/reusable_test.yml
index d2d0bcc38248..5dc531af45e6 100644
--- a/.github/workflows/reusable_test.yml
+++ b/.github/workflows/reusable_test.yml
@@ -51,12 +51,6 @@ name: Testing workflow
       AWS_DEFAULT_REGION:
         description: the region of the aws param store.
         required: true
-      DOCKER_USERNAME:
-        description: username of the docker user.
-        required: true
-      DOCKER_PASSWORD:
-        description: password to the docker user.
-        required: true
 
 env:
   # Force the stdout and stderr streams to be unbuffered
@@ -65,8 +59,6 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
-  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
   runner_labels_setup:
@@ -157,6 +149,7 @@ jobs:
       - name: Download json reports
         uses: actions/download-artifact@v4
         with:
+          pattern: build_report_package_*
           path: ${{ env.REPORTS_PATH }}
 
       - name: Docker setup

From 5014f1abda31982512e9e5a907b823a92ae679c8 Mon Sep 17 00:00:00 2001
From: MyroTk <myroslav6@gmail.com>
Date: Wed, 22 May 2024 13:12:36 -0700
Subject: [PATCH 5/9] specify docker tag, minor fixes

---
 .github/workflows/regression.yml         | 46 ++++++++++++++++++++++++
 .github/workflows/release_branches.yml   | 14 ++++----
 .github/workflows/reusable_build.yml     |  8 +++++
 .github/workflows/reusable_test.yml      |  8 +++++
 tests/ci/ast_fuzzer_check.py             |  2 +-
 tests/ci/build_check.py                  |  6 ++--
 tests/ci/docs_check.py                   |  2 +-
 tests/ci/fast_test_check.py              |  2 +-
 tests/ci/functional_test_check.py        |  2 +-
 tests/ci/install_check.py                |  4 +--
 tests/ci/performance_comparison_check.py |  2 +-
 tests/ci/pr_info.py                      | 12 +++++--
 tests/ci/sqlancer_check.py               |  4 +--
 tests/ci/stress_check.py                 |  2 +-
 tests/ci/style_check.py                  |  2 +-
 tests/ci/unit_tests_check.py             |  2 +-
 16 files changed, 94 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml
index f97ef2a1e295..991b11a0a845 100644
--- a/.github/workflows/regression.yml
+++ b/.github/workflows/regression.yml
@@ -181,6 +181,52 @@ jobs:
           name: ${{ env.SUITE }}-${{ inputs.arch }}-artifacts
           path: ${{ env.artifact_paths}}
 
+  Alter:
+   strategy:
+     fail-fast: false
+     matrix:
+      ONLY: [replace, attach, move]
+   needs: [runner_labels_setup]
+   runs-on: ${{ fromJson(needs.runner_labels_setup.outputs.runner_labels) }}
+   timeout-minutes: ${{ inputs.timeout_minutes }}
+   steps:
+      - name: Checkout regression repo
+        uses: actions/checkout@v4
+        with:
+          repository: Altinity/clickhouse-regression
+          ref: ${{ inputs.commit }}
+      - name: Set envs
+        run: |
+          cat >> "$GITHUB_ENV" << 'EOF'
+          REPORTS_PATH=${{ runner.temp }}/reports_dir
+          SUITE=alter
+          STORAGE=/${{ matrix.ONLY }}_partition
+          EOF
+      - name: Download json reports
+        uses: actions/download-artifact@v4
+        with:
+          path: ${{ env.REPORTS_PATH }}
+          name: build_report_package_${{ inputs.arch }}
+      - name: Setup
+        run: .github/setup.sh
+      - name: Get deb url
+        run: python3 .github/get-deb-url.py --reports-path ${{ env.REPORTS_PATH }} --github-env $GITHUB_ENV
+      - name: Run ${{ env.SUITE }} suite
+        run: python3
+              -u alter/regression.py
+              --clickhouse-binary-path ${{ env.clickhouse_binary_path }}
+              --only "/alter/${{ matrix.ONLY }} partition/*"
+              --attr project="$GITHUB_REPOSITORY" project.id="$GITHUB_REPOSITORY_ID" package="${{ env.clickhouse_binary_path }}" version="${{ env.version }}" user.name="$GITHUB_ACTOR" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.id="$GITHUB_RUN_ID" job.url="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID" arch="$(uname -i)"
+              ${{ env.args }}
+      - name: Create and upload logs
+        if: always()
+        run: .github/create_and_upload_logs.sh 1
+      - uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: ${{ env.SUITE }}-${{ env.ONLY }}_partition-${{ inputs.arch }}-artifacts
+          path: ${{ env.artifact_paths}}
+
   Benchmark:
     strategy:
       fail-fast: false
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index ee3bda324385..82942d682a9c 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -68,7 +68,7 @@ jobs:
 
   DockerHubPush:
     needs: [DockerHubPushAmd64, DockerHubPushAarch64]
-    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx41, altinity-image-x86-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce]
     steps:
       - name: Check out repository code
         uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
@@ -260,7 +260,7 @@ jobs:
     secrets: inherit
     with:
       test_name: ClickHouse build check
-      runner_type: altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-app-docker-ce
       timeout_minutes: 180
       additional_envs: |
         NEEDS_DATA<<NDENV
@@ -277,7 +277,7 @@ jobs:
       - BuilderDebRelease
       - BuilderDebAarch64
       - SignRelease
-    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-x86-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-app-docker-ce]
     timeout-minutes: 180
     steps:
       - name: Check out repository code
@@ -628,7 +628,7 @@ jobs:
     uses: ./.github/workflows/regression.yml
     secrets: inherit
     with:
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce, altinity-setup-regression
+      runner_type: altinity-on-demand, altinity-setup-regression, altinity-type-cpx51, altinity-image-x86-app-docker-ce
       commit: 6da94b78dc53cb8965ab56c04a89ebf54ed04cbc
       arch: release 
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
@@ -638,14 +638,14 @@ jobs:
     uses: ./.github/workflows/regression.yml
     secrets: inherit
     with:
-      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-app-docker-ce, altinity-setup-regression
+      runner_type: altinity-on-demand, altinity-setup-regression, altinity-type-cax41, altinity-image-arm-app-docker-ce
       commit: 6da94b78dc53cb8965ab56c04a89ebf54ed04cbc
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
   SignRelease:
     needs: [BuilderDebRelease]
-    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-in-ash, altinity-image-x86-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-app-docker-ce]
     timeout-minutes: 180
     steps:
       - name: Set envs
@@ -720,7 +720,7 @@ jobs:
       - RegressionTestsRelease
       - RegressionTestsAarch64
       - SignRelease
-    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-x86-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-app-docker-ce]
     steps:
       - name: Check out repository code
         uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml
index aca556d0a405..aeff0d678941 100644
--- a/.github/workflows/reusable_build.yml
+++ b/.github/workflows/reusable_build.yml
@@ -35,6 +35,12 @@ name: Build ClickHouse
       AWS_DEFAULT_REGION:
         description: the region of the aws param store.
         required: true
+      DOCKER_USERNAME:
+        description: username of the docker user.
+        required: true
+      DOCKER_PASSWORD:
+        description: password to the docker user.
+        required: true
 
 env:
   # Force the stdout and stderr streams to be unbuffered
@@ -42,6 +48,8 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
   runner_labels_setup:
diff --git a/.github/workflows/reusable_test.yml b/.github/workflows/reusable_test.yml
index 5dc531af45e6..ee5b9baf913b 100644
--- a/.github/workflows/reusable_test.yml
+++ b/.github/workflows/reusable_test.yml
@@ -51,6 +51,12 @@ name: Testing workflow
       AWS_DEFAULT_REGION:
         description: the region of the aws param store.
         required: true
+      DOCKER_USERNAME:
+        description: username of the docker user.
+        required: true
+      DOCKER_PASSWORD:
+        description: password to the docker user.
+        required: true
 
 env:
   # Force the stdout and stderr streams to be unbuffered
@@ -59,6 +65,8 @@ env:
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_DEFAULT_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+  DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+  DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
 jobs:
   runner_labels_setup:
diff --git a/tests/ci/ast_fuzzer_check.py b/tests/ci/ast_fuzzer_check.py
index f00d9a1e784a..a1622bbf319c 100644
--- a/tests/ci/ast_fuzzer_check.py
+++ b/tests/ci/ast_fuzzer_check.py
@@ -78,7 +78,7 @@ def main():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
 
-    docker_image = get_image_with_version(reports_path, IMAGE_NAME)
+    docker_image = get_image_with_version(reports_path, IMAGE_NAME, version=pr_info.docker_image_tag)
 
     build_name = get_build_name_for_check(check_name)
     urls = read_build_urls(build_name, reports_path)
diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
index a358b590f65d..737f7f1e8a2c 100644
--- a/tests/ci/build_check.py
+++ b/tests/ci/build_check.py
@@ -250,7 +250,7 @@ def main():
     # e.g. `binary_darwin_aarch64/clickhouse` for `binary_darwin`
     check_for_success_run(s3_helper, f"{s3_path_prefix}/", build_name, version)
 
-    docker_image = get_image_with_version(IMAGES_PATH, IMAGE_NAME)
+    docker_image = get_image_with_version(IMAGES_PATH, IMAGE_NAME, version=pr_info.docker_image_tag)
     image_version = docker_image.version
 
     logging.info("Got version from repo %s", version.string)
@@ -351,7 +351,7 @@ def main():
     print(f"::notice ::Log URL: {log_url}")
 
     src_path = os.path.join(TEMP_PATH, "build_source.src.tar.gz")
-   
+
     if os.path.exists(src_path):
         src_url = s3_helper.upload_build_file_to_s3(
             Path(src_path), s3_path_prefix + "/clickhouse-" + version.string + ".src.tar.gz"
@@ -361,7 +361,7 @@ def main():
         logging.info("Source tar doesn't exist")
 
     print(f"::notice ::Source tar URL: {src_url}")
-    
+
     build_result = BuildResult(
         build_name,
         log_url,
diff --git a/tests/ci/docs_check.py b/tests/ci/docs_check.py
index 1fbe14004582..d859be86dadb 100644
--- a/tests/ci/docs_check.py
+++ b/tests/ci/docs_check.py
@@ -81,7 +81,7 @@ def main():
     elif args.force:
         logging.info("Check the docs because of force flag")
 
-    docker_image = get_image_with_version(reports_path, "altinityinfra/docs-builder")
+    docker_image = get_image_with_version(reports_path, "altinityinfra/docs-builder", version=pr_info.docker_image_tag)
 
     test_output = temp_path / "docs_check_log"
     test_output.mkdir(parents=True, exist_ok=True)
diff --git a/tests/ci/fast_test_check.py b/tests/ci/fast_test_check.py
index aa0fd6ab041b..d45161892061 100644
--- a/tests/ci/fast_test_check.py
+++ b/tests/ci/fast_test_check.py
@@ -109,7 +109,7 @@ def main():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
 
-    docker_image = get_image_with_version(reports_path, "altinityinfra/fasttest")
+    docker_image = get_image_with_version(reports_path, "altinityinfra/fasttest", version=pr_info.docker_image_tag)
 
     s3_helper = S3Helper()
 
diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py
index 53fc908039e3..ae21c4452785 100644
--- a/tests/ci/functional_test_check.py
+++ b/tests/ci/functional_test_check.py
@@ -291,7 +291,7 @@ def main():
             sys.exit(0)
 
     image_name = get_image_name(check_name)
-    docker_image = get_image_with_version(reports_path, image_name)
+    docker_image = get_image_with_version(reports_path, image_name, version=pr_info.docker_image_tag)
 
     packages_path = temp_path / "packages"
     packages_path.mkdir(parents=True, exist_ok=True)
diff --git a/tests/ci/install_check.py b/tests/ci/install_check.py
index 419c1c3b303f..5f4d122c31cc 100644
--- a/tests/ci/install_check.py
+++ b/tests/ci/install_check.py
@@ -273,7 +273,7 @@ def main():
             sys.exit(0)
 
     docker_images = {
-        name: get_image_with_version(REPORTS_PATH, name)
+        name: get_image_with_version(REPORTS_PATH, name, version=pr_info.docker_image_tag)
         for name in (RPM_IMAGE, DEB_IMAGE)
     }
     prepare_test_scripts()
@@ -354,7 +354,7 @@ def filter_artifacts(path: str) -> bool:
         args.check_name,
     )
 
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
+    ch_helper.insert_events_into(db="gh-data", table="checks", events=prepared_events)
 
     if state == FAILURE:
         sys.exit(1)
diff --git a/tests/ci/performance_comparison_check.py b/tests/ci/performance_comparison_check.py
index 83b47a16de5f..b4ce9757ea8e 100644
--- a/tests/ci/performance_comparison_check.py
+++ b/tests/ci/performance_comparison_check.py
@@ -121,7 +121,7 @@ def main():
         .replace("/", "_")
     )
 
-    docker_image = get_image_with_version(reports_path, IMAGE_NAME)
+    docker_image = get_image_with_version(reports_path, IMAGE_NAME, version=pr_info.docker_image_tag)
 
     result_path = temp_path / "result"
     result_path.mkdir(parents=True, exist_ok=True)
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index 7208fdc0f324..18497ab84116 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -13,6 +13,10 @@
     GITHUB_RUN_URL,
     GITHUB_EVENT_PATH,
 )
+from version_helper import (
+    Git,
+    get_version_from_repo,
+)
 
 FORCE_TESTS_LABEL = "force tests"
 SKIP_MERGEABLE_CHECK_LABEL = "skip mergeable check"
@@ -36,7 +40,7 @@
     ".json",
 ]
 RETRY_SLEEP = 0
-
+VERSION = get_version_from_repo(git=Git(True))
 
 def get_pr_for_commit(sha, ref):
     if not ref:
@@ -115,6 +119,7 @@ def __init__(
 
         if "pull_request" in github_event:  # pull request and other similar events
             self.number = github_event["pull_request"]["number"]  # type: int
+            self.docker_image_tag = str(self.number) # type: str
             if pr_event_from_api:
                 try:
                     response = get_gh_api(
@@ -191,6 +196,7 @@ def __init__(
             if pull_request is None or pull_request["state"] == "closed":
                 # it's merged PR to master
                 self.number = 0
+                self.docker_image_tag = str(self.number) + "-" + str(self.sha)
                 self.labels = set()
                 self.pr_html_url = f"{repo_prefix}/commits/{ref}"
                 self.base_ref = ref
@@ -202,6 +208,7 @@ def __init__(
                 )
             else:
                 self.number = pull_request["number"]
+                self.docker_image_tag = str(self.number)
                 self.labels = {label["name"] for label in pull_request["labels"]}
 
                 self.base_ref = pull_request["base"]["ref"]
@@ -247,7 +254,8 @@ def __init__(
             self.sha = os.getenv(
                 "GITHUB_SHA", "0000000000000000000000000000000000000000"
             )
-            self.number = 0
+            self.number = f"{VERSION.major}.{VERSION.minor}.{VERSION.patch}"
+            self.docker_image_tag = str(self.number) + "-" + str(self.sha)
             self.labels = set()
             repo_prefix = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}"
             self.task_url = GITHUB_RUN_URL
diff --git a/tests/ci/sqlancer_check.py b/tests/ci/sqlancer_check.py
index 1da36e7e5165..5712547355f9 100644
--- a/tests/ci/sqlancer_check.py
+++ b/tests/ci/sqlancer_check.py
@@ -65,7 +65,7 @@ def main():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
 
-    docker_image = get_image_with_version(reports_path, IMAGE_NAME)
+    docker_image = get_image_with_version(reports_path, IMAGE_NAME, version=pr_info.docker_image_tag)
 
     build_name = get_build_name_for_check(check_name)
     urls = read_build_urls(build_name, reports_path)
@@ -160,7 +160,7 @@ def main():
         report_url,
         check_name,
     )
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
+    ch_helper.insert_events_into(db="gh-data", table="checks", events=prepared_events)
 
 
 if __name__ == "__main__":
diff --git a/tests/ci/stress_check.py b/tests/ci/stress_check.py
index 23b99fecd46e..2d2863873a34 100644
--- a/tests/ci/stress_check.py
+++ b/tests/ci/stress_check.py
@@ -122,7 +122,7 @@ def run_stress_test(docker_image_name: str) -> None:
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
 
-    docker_image = get_image_with_version(reports_path, docker_image_name)
+    docker_image = get_image_with_version(reports_path, docker_image_name, version=pr_info.docker_image_tag)
 
     packages_path = temp_path / "packages"
     packages_path.mkdir(parents=True, exist_ok=True)
diff --git a/tests/ci/style_check.py b/tests/ci/style_check.py
index ec707bea22b9..9e40134d57a9 100644
--- a/tests/ci/style_check.py
+++ b/tests/ci/style_check.py
@@ -164,7 +164,7 @@ def main():
         code = int(state != "success")
         sys.exit(code)
 
-    docker_image = get_image_with_version(reports_path, "altinityinfra/style-test")
+    docker_image = get_image_with_version(reports_path, "altinityinfra/style-test", version=pr_info.docker_image_tag)
     s3_helper = S3Helper()
 
     cmd = (
diff --git a/tests/ci/unit_tests_check.py b/tests/ci/unit_tests_check.py
index 16316a917750..cb8a3e7e5af1 100644
--- a/tests/ci/unit_tests_check.py
+++ b/tests/ci/unit_tests_check.py
@@ -130,7 +130,7 @@ def main():
         logging.info("Check is already finished according to github status, exiting")
         sys.exit(0)
 
-    docker_image = get_image_with_version(REPORTS_PATH, IMAGE_NAME)
+    docker_image = get_image_with_version(REPORTS_PATH, IMAGE_NAME, version=pr_info.docker_image_tag)
 
     download_unit_tests(check_name, REPORTS_PATH, TEMP_PATH)
 

From 2c5051922a3654eb4bda316108a6560cc0638c0f Mon Sep 17 00:00:00 2001
From: MyroTk <myroslav6@gmail.com>
Date: Tue, 4 Jun 2024 12:01:21 -0700
Subject: [PATCH 6/9] test fixes

---
 .github/workflows/release_branches.yml    | 106 +++++++++++-----------
 docker/test/integration/runner/Dockerfile |  95 ++++++++++---------
 docker/test/stateful/Dockerfile           |   2 +-
 docker/test/stateless/Dockerfile          |  37 ++++----
 4 files changed, 118 insertions(+), 122 deletions(-)

diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index 82942d682a9c..a8d3d9bae93f 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -31,7 +31,7 @@ on: # yamllint disable-line rule:truthy
 
 jobs:
   DockerHubPushAarch64:
-    runs-on: [self-hosted, altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-type-cax41, altinity-in-hel1, altinity-image-arm-system-ubuntu-22.04]
     steps:
       - name: Check out repository code
         uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
@@ -49,7 +49,7 @@ jobs:
           path: ${{ runner.temp }}/docker_images_check/changed_images_aarch64.json
 
   DockerHubPushAmd64:
-    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04]
     steps:
       - name: Check out repository code
         uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
@@ -68,7 +68,7 @@ jobs:
 
   DockerHubPush:
     needs: [DockerHubPushAmd64, DockerHubPushAarch64]
-    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx41, altinity-image-x86-system-ubuntu-22.04]
     steps:
       - name: Check out repository code
         uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
@@ -112,7 +112,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Compatibility check X86
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cpx41, altinity-image-x86-system-ubuntu-22.04
       timeout_minutes: 180
       run_command: |
         cd "$REPO_COPY/tests/ci"
@@ -124,7 +124,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Compatibility check Aarch64
-      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-system-ubuntu-22.04
       timeout_minutes: 180
       run_command: |
         cd "$REPO_COPY/tests/ci"
@@ -141,7 +141,7 @@ jobs:
       build_name: package_release
       checkout_depth: 0
       timeout_minutes: 180
-      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04, altinity-setup-builder
       additional_envs: |
         CLICKHOUSE_STABLE_VERSION_SUFFIX=altinitystable
 
@@ -153,7 +153,7 @@ jobs:
       build_name: package_aarch64
       checkout_depth: 0
       timeout_minutes: 180
-      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04, altinity-setup-builder
       additional_envs: |
         CLICKHOUSE_STABLE_VERSION_SUFFIX=altinitystable
 
@@ -165,7 +165,7 @@ jobs:
       build_name: package_asan
       checkout_depth: 0
       timeout_minutes: 180
-      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04, altinity-setup-builder
       additional_envs: |
         CLICKHOUSE_STABLE_VERSION_SUFFIX=altinitystable
 
@@ -177,7 +177,7 @@ jobs:
       build_name: package_ubsan
       checkout_depth: 0
       timeout_minutes: 180
-      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04, altinity-setup-builder
       additional_envs: |
         CLICKHOUSE_STABLE_VERSION_SUFFIX=altinitystable
         
@@ -189,7 +189,7 @@ jobs:
       build_name: package_tsan
       checkout_depth: 0
       timeout_minutes: 180
-      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04, altinity-setup-builder
       additional_envs: |
         CLICKHOUSE_STABLE_VERSION_SUFFIX=altinitystable
 
@@ -201,7 +201,7 @@ jobs:
       build_name: package_msan
       checkout_depth: 0
       timeout_minutes: 180
-      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04, altinity-setup-builder
       additional_envs: |
         CLICKHOUSE_STABLE_VERSION_SUFFIX=altinitystable
 
@@ -213,7 +213,7 @@ jobs:
       build_name: package_debug
       checkout_depth: 0
       timeout_minutes: 180
-      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-ccx53, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04, altinity-setup-builder
       additional_envs: |
         CLICKHOUSE_STABLE_VERSION_SUFFIX=altinitystable
 
@@ -224,7 +224,7 @@ jobs:
     needs:
       - BuilderDebRelease
       - BuilderDebAarch64
-    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-system-ubuntu-22.04]
     timeout-minutes: 180
     steps:
       - name: Check out repository code
@@ -260,7 +260,7 @@ jobs:
     secrets: inherit
     with:
       test_name: ClickHouse build check
-      runner_type: altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-app-docker-ce
+      runner_type: altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-system-ubuntu-22.04
       timeout_minutes: 180
       additional_envs: |
         NEEDS_DATA<<NDENV
@@ -277,7 +277,7 @@ jobs:
       - BuilderDebRelease
       - BuilderDebAarch64
       - SignRelease
-    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-system-ubuntu-22.04]
     timeout-minutes: 180
     steps:
       - name: Check out repository code
@@ -298,7 +298,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Install packages (amd64)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 install_check.py "$CHECK_NAME"
@@ -309,7 +309,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Install packages (arm64)
-      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-system-ubuntu-22.04
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 install_check.py "$CHECK_NAME"
@@ -323,7 +323,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateless tests (release)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=10800
       run_command: |
@@ -336,7 +336,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateless tests (aarch64)
-      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-snapshot-docker_ipv6_arm
+      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=10800
       run_command: |
@@ -349,7 +349,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateless tests (asan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=10800
       batches: 4
@@ -363,7 +363,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateless tests (tsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=10800
       batches: 4
@@ -377,7 +377,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateless tests (ubsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=10800
       batches: 4
@@ -391,7 +391,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateless tests (msan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=10800
       batches: 4
@@ -405,7 +405,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateless tests (debug)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=10800
       batches: 4
@@ -422,7 +422,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateful tests (release)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
@@ -435,7 +435,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateful tests (aarch64)
-      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-snapshot-docker_ipv6_arm
+      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
@@ -448,65 +448,65 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateful tests (asan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-        
+
   FunctionalStatefulTestTsan:
     needs: [BuilderDebTsan]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stateful tests (tsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-        
+
   FunctionalStatefulTestMsan:
     needs: [BuilderDebMsan]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stateful tests (msan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-        
+
   FunctionalStatefulTestUBsan:
     needs: [BuilderDebUBsan]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stateful tests (ubsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-        
+
   FunctionalStatefulTestDebug:
     needs: [BuilderDebDebug]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stateful tests (debug)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-        
+
 ##############################################################################################
 ######################################### STRESS TESTS #######################################
 ##############################################################################################
@@ -516,51 +516,51 @@ jobs:
     secrets: inherit
     with:
       test_name: Stress test (asan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 stress_check.py "$CHECK_NAME"
-        
+
   StressTestTsan:
     needs: [BuilderDebTsan]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stress test (tsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 stress_check.py "$CHECK_NAME"
-        
+
   StressTestMsan:
     needs: [BuilderDebMsan]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stress test (msan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 stress_check.py "$CHECK_NAME"
-        
+
   StressTestUBsan:
     needs: [BuilderDebUBsan]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stress test (ubsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 stress_check.py "$CHECK_NAME"
-        
+
   StressTestDebug:
     needs: [BuilderDebDebug]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stress test (debug)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 stress_check.py "$CHECK_NAME"
@@ -574,7 +574,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Integration tests (asan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       batches: 4
       timeout_minutes: 180
       run_command: |
@@ -587,7 +587,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Integration tests (asan, analyzer)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       batches: 6
       timeout_minutes: 180
       run_command: |
@@ -600,7 +600,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Integration tests (tsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       batches: 6
       timeout_minutes: 180
       run_command: |
@@ -613,7 +613,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Integration tests (release)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
       batches: 6
       timeout_minutes: 180
       run_command: |
@@ -628,7 +628,7 @@ jobs:
     uses: ./.github/workflows/regression.yml
     secrets: inherit
     with:
-      runner_type: altinity-on-demand, altinity-setup-regression, altinity-type-cpx51, altinity-image-x86-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-system-ubuntu-22.04, altinity-setup-regression
       commit: 6da94b78dc53cb8965ab56c04a89ebf54ed04cbc
       arch: release 
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
@@ -638,14 +638,14 @@ jobs:
     uses: ./.github/workflows/regression.yml
     secrets: inherit
     with:
-      runner_type: altinity-on-demand, altinity-setup-regression, altinity-type-cax41, altinity-image-arm-app-docker-ce
+      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-system-ubuntu-22.04, altinity-setup-regression
       commit: 6da94b78dc53cb8965ab56c04a89ebf54ed04cbc
       arch: aarch64
       build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
 
   SignRelease:
     needs: [BuilderDebRelease]
-    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-type-cpx51, altinity-image-x86-system-ubuntu-22.04]
     timeout-minutes: 180
     steps:
       - name: Set envs
@@ -720,7 +720,7 @@ jobs:
       - RegressionTestsRelease
       - RegressionTestsAarch64
       - SignRelease
-    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-app-docker-ce]
+    runs-on: [self-hosted, altinity-on-demand, altinity-setup-reporter, altinity-type-cax11, altinity-image-arm-system-ubuntu-22.04]
     steps:
       - name: Check out repository code
         uses: Altinity/checkout@19599efdf36c4f3f30eb55d5bb388896faea69f6
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index 9408f47039a0..79a86e3efeb0 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -8,33 +8,33 @@ RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 RUN apt-get update \
     && env DEBIAN_FRONTEND=noninteractive apt-get install --yes \
-    adduser \
+    adduser='3.*' \
     ca-certificates \
-    bash \
-    btrfs-progs \
-    e2fsprogs \
-    iptables \
-    xfsprogs \
+    bash='5.*' \
+    btrfs-progs='5.4.*' \
+    e2fsprogs='1.45.*' \
+    iptables='1.8.*' \
+    xfsprogs='5.3.*' \
     tar \
-    pigz \
+    pigz='2.4*' \
     wget \
     git \
-    iproute2 \
+    iproute2='5.5.*' \
     cgroupfs-mount \
     python3-pip \
     tzdata \
-    libicu-dev \
-    bsdutils \
+    libicu-dev='66.*' \
+    bsdutils='1:2.34*' \
     curl \
-    python3-pika \
+    python3-pika='0.11.*' \
     liblua5.1-dev \
-    luajit \
-    libssl-dev \
-    libcurl4-openssl-dev \
+    luajit='2.1.*' \
+    libssl-dev='1.1.*' \
+    libcurl4-openssl-dev='7.68.*' \
     gdb \
     software-properties-common \
-    libkrb5-dev \
-    krb5-user \
+    libkrb5-dev='1.17*' \
+    krb5-user='1.17*' \
     g++ \
     && rm -rf \
         /var/lib/apt/lists/* \
@@ -61,39 +61,38 @@ RUN dockerd --version; docker --version
 
 RUN python3 -m pip install --no-cache-dir \
     PyMySQL \
-    aerospike==4.0.0 \
-    avro==1.10.2 \
-    asyncio \
-    cassandra-driver \
-    confluent-kafka==1.5.0 \
-    dict2xml \
-    dicttoxml \
-    docker==6.1.3 \
-    docker-compose==1.29.2 \
-    grpcio \
-    grpcio-tools \
-    kafka-python \
-    kazoo \
-    lz4 \
-    minio \
-    nats-py \
-    protobuf \
-    psycopg2-binary==2.8.6 \
-    pymongo==3.11.0 \
-    pytest \
-    pytest-order==1.0.0 \
-    pytest-timeout \
-    pytest-random \
-    pytest-xdist \
-    pytest-repeat \
+    aerospike~=4.0 \
+    avro~=1.10 \
+    asyncio~=3.4 \
+    cassandra-driver~=3.28 \
+    confluent-kafka~=1.5 \
+    dict2xml~=1.7 \
+    dicttoxml~=1.7 \
+    docker~=6.1 \
+    docker-compose~=1.29 \
+    grpcio~=1.56 \
+    grpcio-tools~=1.56 \
+    kafka-python~=2.0 \
+    kazoo~=2.9 \
+    lz4~=4.3 \
+    minio~=7.1 \
+    nats-py~=2.3 \
+    protobuf~=4.24 \
+    psycopg2-binary~=2.8 \
+    pymongo~=3.11 \
+    pytest~=7.4 \
+    pytest-order~=1.0 \
+    pytest-timeout~=2.1 \
+    pytest-xdist~=3.3 \
+    pytest-repeat~=0.9 \
     pytz \
-    redis \
-    tzlocal==2.1 \
-    urllib3 \
-    requests-kerberos \
-    pyhdfs \
-    azure-storage-blob \
-    meilisearch==0.18.3 
+    redis~=4.6 \
+    tzlocal~=2.1 \
+    urllib3~=1.25 \
+    requests-kerberos~=0.14 \
+    pyhdfs~=0.3 \
+    azure-storage-blob~=12.17 \
+    meilisearch~=0.18
 
 COPY modprobe.sh /usr/local/bin/modprobe
 COPY dockerd-entrypoint.sh /usr/local/bin/
diff --git a/docker/test/stateful/Dockerfile b/docker/test/stateful/Dockerfile
index f10dc5aec833..9ab41a7bee0e 100644
--- a/docker/test/stateful/Dockerfile
+++ b/docker/test/stateful/Dockerfile
@@ -19,7 +19,7 @@ COPY s3downloader /s3downloader
 ENV S3_URL="https://clickhouse-datasets.s3.amazonaws.com"
 ENV DATASETS="hits visits"
 
-RUN npm install -g azurite
+# RUN npm install -g azurite
 RUN npm install tslib
 
 COPY run.sh /
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index ec830f919901..64bf9772c95d 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -9,43 +9,41 @@ ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/down
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
         apt-get install --yes --no-install-recommends \
-            awscli \
-            brotli \
-            lz4 \
+            awscli=1.18.* \
+            brotli=1.0.* \
             expect \
-            golang \
+            golang=2:1.13* \
             lsof \
             mysql-client=8.0* \
-            ncdu \
+            ncdu=1.14.* \
             netcat-openbsd \
-            nodejs \
-            npm \
+            nodejs=10.19.* \
+            npm=6.14.* \
             openjdk-11-jre-headless \
-            openssl \
+            openssl=1.1.1* \
             postgresql-client \
-            protobuf-compiler \
+            protobuf-compiler=3.6.* \
             python3 \
-            python3-lxml \
-            python3-pip \
-            python3-requests \
+            python3-lxml=4.5.* \
+            python3-pip=20.0.* \
+            python3-requests=2.22.* \
             python3-termcolor \
-            qemu-user-static \
+            qemu-user-static='1:4.2*' \
             sqlite3 \
             sudo \
             telnet \
             tree \
             unixodbc \
             wget \
-            rustc \
-            cargo \
             zstd \
             file \
             pv \
-            rpm2cpio \
-            cpio \
+            rpm2cpio=4.14.* \
+            cpio=2.13* \
     && apt-get clean
 
-RUN pip3 install numpy scipy pandas Jinja2
+
+RUN pip3 install numpy~=1.24 scipy~=1.10 pandas~=2.0 Jinja2~=3.1
 
 RUN mkdir -p /tmp/clickhouse-odbc-tmp \
    && wget -nv -O - ${odbc_driver_url} | tar --strip-components=1 -xz -C /tmp/clickhouse-odbc-tmp \
@@ -81,8 +79,7 @@ ENV MINIO_ROOT_USER="clickhouse"
 ENV MINIO_ROOT_PASSWORD="clickhouse"
 ENV EXPORT_S3_STORAGE_POLICIES=1
 
-RUN npm install -g azurite
-RUN npm install tslib
+RUN npm install -g azurite@3.25.1
 
 COPY run.sh /
 COPY setup_minio.sh /

From 71e9b477a54264813aa2c9db6655ac997ddf0ce8 Mon Sep 17 00:00:00 2001
From: MyroTk <myroslav6@gmail.com>
Date: Tue, 4 Jun 2024 22:33:09 -0700
Subject: [PATCH 7/9] runner config

---
 .github/workflows/release_branches.yml    | 36 +++++++++++------------
 docker/test/integration/runner/Dockerfile |  1 +
 docker/test/stateful/Dockerfile           |  2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index a8d3d9bae93f..411de121625a 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -323,7 +323,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateless tests (release)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=10800
       run_command: |
@@ -336,7 +336,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateless tests (aarch64)
-      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-snapshot-docker_ipv6_arm, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=10800
       run_command: |
@@ -349,63 +349,63 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateless tests (asan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=10800
       batches: 4
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-        
+
   FunctionalStatelessTestTsan:
     needs: [BuilderDebTsan]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stateless tests (tsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=10800
       batches: 4
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-        
+
   FunctionalStatelessTestUBsan:
     needs: [BuilderDebUBsan]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stateless tests (ubsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=10800
       batches: 4
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-        
+
   FunctionalStatelessTestMsan:
     needs: [BuilderDebMsan]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stateless tests (msan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=10800
       batches: 4
       run_command: |
         cd "$REPO_COPY/tests/ci"
         python3 functional_test_check.py "$CHECK_NAME" "$KILL_TIMEOUT"
-        
+
   FunctionalStatelessTestDebug:
     needs: [BuilderDebDebug]
     uses: ./.github/workflows/reusable_test.yml
     secrets: inherit
     with:
       test_name: Stateless tests (debug)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=10800
       batches: 4
@@ -422,7 +422,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateful tests (release)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
@@ -435,7 +435,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateful tests (aarch64)
-      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-snapshot-docker_ipv6_arm, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
@@ -448,7 +448,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateful tests (asan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
@@ -461,7 +461,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateful tests (tsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
@@ -474,7 +474,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateful tests (msan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
@@ -487,7 +487,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateful tests (ubsan)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
@@ -500,7 +500,7 @@ jobs:
     secrets: inherit
     with:
       test_name: Stateful tests (debug)
-      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-system-ubuntu-22.04
+      runner_type: altinity-on-demand, altinity-type-cpx51, altinity-in-ash, altinity-image-x86-snapshot-docker_ipv6_x86, altinity-setup-snapshot
       additional_envs: |
         KILL_TIMEOUT=3600
       run_command: |
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index 79a86e3efeb0..468767067831 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -89,6 +89,7 @@ RUN python3 -m pip install --no-cache-dir \
     redis~=4.6 \
     tzlocal~=2.1 \
     urllib3~=1.25 \
+    requests~=2.31.0 \
     requests-kerberos~=0.14 \
     pyhdfs~=0.3 \
     azure-storage-blob~=12.17 \
diff --git a/docker/test/stateful/Dockerfile b/docker/test/stateful/Dockerfile
index 9ab41a7bee0e..8aefe4c87b95 100644
--- a/docker/test/stateful/Dockerfile
+++ b/docker/test/stateful/Dockerfile
@@ -7,7 +7,7 @@ FROM altinityinfra/stateless-test:$FROM_TAG
 RUN apt-get update -y \
     && env DEBIAN_FRONTEND=noninteractive \
         apt-get install --yes --no-install-recommends \
-        python3-requests \
+        python3-requests=2.22.* \
         nodejs \
         npm \
         rpm2cpio \

From 5780d3c4dbd7cc22d73a8c34395af3ce4758ce39 Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Wed, 5 Jun 2024 11:43:26 -0700
Subject: [PATCH 8/9] Update ci-runner.py

---
 tests/integration/ci-runner.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/integration/ci-runner.py b/tests/integration/ci-runner.py
index a40117264c5c..78560de8c115 100755
--- a/tests/integration/ci-runner.py
+++ b/tests/integration/ci-runner.py
@@ -628,7 +628,8 @@ def run_test_group(
 
             test_cmd = " ".join([test for test in sorted(test_names)])
             parallel_cmd = (
-                " --parallel {} ".format(num_workers) if (num_workers > 0 or i > 0) else ""
+                ## NOTE(vnemkov) Second and consecutive runs non-parallel to improve stability
+                " --parallel {} ".format(num_workers) if (num_workers > 0 and i == 0) else ""
             )
             # -r -- show extra test summary:
             # -f -- (f)ailed

From d2371d2e7b9fb6761734fc5c926f90ec48aa2700 Mon Sep 17 00:00:00 2001
From: MyroTk <44327070+MyroTk@users.noreply.github.com>
Date: Wed, 24 Jul 2024 08:13:38 -0700
Subject: [PATCH 9/9] Update pr_info.py

---
 tests/ci/pr_info.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index 18497ab84116..a4e550c1c38a 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -40,7 +40,6 @@
     ".json",
 ]
 RETRY_SLEEP = 0
-VERSION = get_version_from_repo(git=Git(True))
 
 def get_pr_for_commit(sha, ref):
     if not ref:
@@ -102,6 +101,7 @@ def __init__(
         # release_pr and merged_pr are used for docker images additional cache
         self.release_pr = 0
         self.merged_pr = 0
+        self.version = get_version_from_repo(git=Git(True))
         ref = github_event.get("ref", "refs/heads/master")
         if ref and ref.startswith("refs/heads/"):
             ref = ref[11:]
@@ -254,7 +254,7 @@ def __init__(
             self.sha = os.getenv(
                 "GITHUB_SHA", "0000000000000000000000000000000000000000"
             )
-            self.number = f"{VERSION.major}.{VERSION.minor}.{VERSION.patch}"
+            self.number = f"{self.version.major}.{self.version.minor}.{self.version.patch}"
             self.docker_image_tag = str(self.number) + "-" + str(self.sha)
             self.labels = set()
             repo_prefix = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}"