From 20ca816ed92b4af993499fb9324a4fd199ccc721 Mon Sep 17 00:00:00 2001 From: MyroTk <44327070+MyroTk@users.noreply.github.com> Date: Mon, 6 Jan 2025 15:31:36 -0500 Subject: [PATCH 1/5] Enable Fuzzers and ARM integration tests --- .github/workflows/release_branches.yml | 57 ++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml index b606fdac826f..3ff1b2bfb834 100644 --- a/.github/workflows/release_branches.yml +++ b/.github/workflows/release_branches.yml @@ -470,6 +470,63 @@ jobs: test_name: Integration tests (release) runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none data: ${{ needs.RunConfig.outputs.data }} + IntegrationTestAarch64: + needs: [RunConfig, BuilderDebRelease] + if: ${{ !failure() && !cancelled() }} + uses: ./.github/workflows/reusable_test.yml + secrets: inherit + with: + test_name: Integration tests (aarch64) + runner_type: altinity-on-demand, altinity-type-cax41, altinity-image-arm-snapshot-22.04-arm, altinity-startup-snapshot, altinity-setup-none + data: ${{ needs.RunConfig.outputs.data }} +############################################################################################# +####################################### AST FUZZERS ######################################### +############################################################################################# + ASTFuzzerAsan: + needs: [RunConfig, BuilderDebAsan] + if: ${{ !failure() && !cancelled() }} + uses: ./.github/workflows/reusable_test.yml + secrets: inherit + with: + test_name: AST fuzzer (asan) + runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none + data: ${{ needs.RunConfig.outputs.data }} + ASTFuzzerTsan: + needs: [RunConfig, BuilderDebTsan] + if: ${{ !failure() && !cancelled() }} + uses: ./.github/workflows/reusable_test.yml + secrets: inherit + with: + test_name: AST fuzzer (tsan) + runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none + data: ${{ needs.RunConfig.outputs.data }} + ASTFuzzerMsan: + needs: [RunConfig, BuilderDebMsan] + if: ${{ !failure() && !cancelled() }} + uses: ./.github/workflows/reusable_test.yml + secrets: inherit + with: + test_name: AST fuzzer (msan) + runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none + data: ${{ needs.RunConfig.outputs.data }} + ASTFuzzerUBsan: + needs: [RunConfig, BuilderDebUBsan] + if: ${{ !failure() && !cancelled() }} + uses: ./.github/workflows/reusable_test.yml + secrets: inherit + with: + test_name: AST fuzzer (ubsan) + runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none + data: ${{ needs.RunConfig.outputs.data }} + ASTFuzzerDebug: + needs: [RunConfig, BuilderDebDebug] + if: ${{ !failure() && !cancelled() }} + uses: ./.github/workflows/reusable_test.yml + secrets: inherit + with: + test_name: AST fuzzer (debug) + runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none + data: ${{ needs.RunConfig.outputs.data }} ############################################################################################# ##################################### REGRESSION TESTS ###################################### ############################################################################################# From 867e26933c5378e7d461c2a6d211124446147012 Mon Sep 17 00:00:00 2001 From: MyroTk <44327070+MyroTk@users.noreply.github.com> Date: Tue, 7 Jan 2025 09:57:17 -0500 Subject: [PATCH 2/5] Update run-fuzzer.sh to use Altinity/ClickHouse repo --- docker/test/fuzzer/run-fuzzer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh index ae1b9e94bed4..821d1c453baf 100755 --- a/docker/test/fuzzer/run-fuzzer.sh +++ b/docker/test/fuzzer/run-fuzzer.sh @@ -23,7 +23,7 @@ BINARY_URL_TO_DOWNLOAD=${BINARY_URL_TO_DOWNLOAD:="https://clickhouse-builds.s3.a function git_clone_with_retry { for _ in 1 2 3 4; do - if git clone --depth 1 https://github.com/ClickHouse/ClickHouse.git -- "$1" 2>&1 | ts '%Y-%m-%d %H:%M:%S';then + if git clone --depth 1 https://github.com/Altinity/ClickHouse.git -- "$1" 2>&1 | ts '%Y-%m-%d %H:%M:%S';then return 0 else sleep 0.5 @@ -448,7 +448,7 @@ p.links a { padding: 5px; margin: 3px; background: #FFF; line-height: 2; white-s
-

AST Fuzzer for PR #${PR_TO_TEST} @ ${SHA_TO_TEST}

+

AST Fuzzer for PR #${PR_TO_TEST} @ ${SHA_TO_TEST}

run.log fuzzer.log.zst From 82b255718b9bac788a9a440b5bdcf3a4f29789f8 Mon Sep 17 00:00:00 2001 From: MyroTk <44327070+MyroTk@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:54:20 -0500 Subject: [PATCH 3/5] kitware gpg fix --- docker/test/util/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/test/util/Dockerfile b/docker/test/util/Dockerfile index 9c4d75ffd2f4..6601acc708fe 100644 --- a/docker/test/util/Dockerfile +++ b/docker/test/util/Dockerfile @@ -34,9 +34,8 @@ RUN apt-get update \ # Install cmake 3.20+ for Rust support # Used https://askubuntu.com/a/1157132 as reference -RUN curl -s https://apt.kitware.com/keys/kitware-archive-latest.asc | \ - gpg --dearmor - > /etc/apt/trusted.gpg.d/kitware.gpg && \ - echo "deb https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" >> /etc/apt/sources.list +RUN curl -s https://apt.kitware.com/keys/kitware-archive-latest.asc | gpg --dearmor - > /etc/apt/trusted.gpg.d/kitware.gpg && \ + echo "deb [signed-by=/etc/apt/trusted.gpg.d/kitware.gpg] https://apt.kitware.com/ubuntu/ $(lsb_release -cs) main" >> /etc/apt/sources.list.d/kitware.list # initial packages RUN apt-get update \ From 819d04f1451d17c7be0db410a447dcab76b2a096 Mon Sep 17 00:00:00 2001 From: MyroTk <44327070+MyroTk@users.noreply.github.com> Date: Tue, 14 Jan 2025 16:54:34 -0500 Subject: [PATCH 4/5] Update release_branches.yml --- .github/workflows/release_branches.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml index 3ff1b2bfb834..8c8c0f313b58 100644 --- a/.github/workflows/release_branches.yml +++ b/.github/workflows/release_branches.yml @@ -471,7 +471,7 @@ jobs: runner_type: altinity-on-demand, altinity-type-cpx51, altinity-image-x86-snapshot-22.04-amd, altinity-startup-snapshot, altinity-setup-none data: ${{ needs.RunConfig.outputs.data }} IntegrationTestAarch64: - needs: [RunConfig, BuilderDebRelease] + needs: [RunConfig, BuilderDebAarch64] if: ${{ !failure() && !cancelled() }} uses: ./.github/workflows/reusable_test.yml secrets: inherit From 95d9d7caf22e0ad01ce3eb029904a35ae7e7f498 Mon Sep 17 00:00:00 2001 From: MyroTk <44327070+MyroTk@users.noreply.github.com> Date: Tue, 14 Jan 2025 22:28:21 -0500 Subject: [PATCH 5/5] Update integration images to not be amd only --- docker/images.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker/images.json b/docker/images.json index 8985368b3b07..80221cb6bb1c 100644 --- a/docker/images.json +++ b/docker/images.json @@ -16,7 +16,6 @@ "dependent": [] }, "docker/test/integration/base": { - "only_amd64": true, "name": "altinityinfra/integration-test", "dependent": [] }, @@ -65,7 +64,6 @@ "dependent": [] }, "docker/test/integration/runner": { - "only_amd64": true, "name": "altinityinfra/integration-tests-runner", "dependent": [] }, @@ -88,7 +86,6 @@ "dependent": [] }, "docker/test/integration/helper_container": { - "only_amd64": true, "name": "altinityinfra/integration-helper", "dependent": [] },