Skip to content

Commit 9ddb837

Browse files
strtgbbstrtgbb
authored
Merge pull request #2013 from Altinity/rebase-cicd-v26.6.1.1193-stable
Antalya 26.6 - CI Fixes
2 parents c8a7afc + 1e5044c commit 9ddb837

31 files changed

Lines changed: 638 additions & 356 deletions

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ Related: https://github.com/ClickHouse/ClickHouse/pull/NNNNN
3333
- [ ] <!---ci_exclude_stateless--> Stateless tests
3434
- [ ] <!---ci_exclude_stateful--> Stateful tests
3535
- [ ] <!---ci_exclude_performance--> Performance tests
36+
- [x] <!---ci_exclude_aarch64|arm--> Aarch64 tests
3637
- [ ] <!---ci_exclude_asan--> All with ASAN
3738
- [x] <!---ci_exclude_tsan--> All with TSAN
3839
- [x] <!---ci_exclude_msan--> All with MSAN
3940
- [x] <!---ci_exclude_ubsan--> All with UBSAN
4041
- [x] <!---ci_exclude_coverage--> All with Coverage
41-
- [ ] <!---ci_exclude_aarch64|arm--> All with Aarch64
4242
- [ ] <!---ci_exclude_regression--> All Regression
4343
- [ ] <!---no_ci_cache--> Disable CI Cache
4444

‎.github/workflows/master.yml‎

Lines changed: 376 additions & 146 deletions
Large diffs are not rendered by default.

‎.github/workflows/pull_request.yml‎

Lines changed: 32 additions & 32 deletions
Large diffs are not rendered by default.

‎.github/workflows/pull_request_community.yml‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
PYTHONUNBUFFERED=1 python3 -m praktika run 'Config Workflow' --workflow "Community PR" --ci --timestamp
8383
8484
fast_test:
85-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
85+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
8686
needs: [config_workflow]
8787
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'RmFzdCB0ZXN0') }}
8888
name: "Fast test"
@@ -124,7 +124,7 @@ jobs:
124124
PYTHONUNBUFFERED=1 python3 -m praktika run 'Fast test' --workflow "Community PR" --ci --timestamp
125125
126126
build_amd_debug:
127-
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
127+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
128128
needs: [config_workflow, fast_test]
129129
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFtZF9kZWJ1Zyk=') }}
130130
name: "Build (amd_debug)"
@@ -179,7 +179,7 @@ jobs:
179179
path: ci/tmp/*.deb
180180

181181
build_amd_asan_ubsan:
182-
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
182+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
183183
needs: [config_workflow, fast_test]
184184
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFtZF9hc2FuX3Vic2FuKQ==') }}
185185
name: "Build (amd_asan_ubsan)"
@@ -241,7 +241,7 @@ jobs:
241241
path: ci/tmp/*.deb
242242

243243
build_amd_binary:
244-
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
244+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
245245
needs: [config_workflow, fast_test]
246246
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFtZF9iaW5hcnkp') }}
247247
name: "Build (amd_binary)"
@@ -289,7 +289,7 @@ jobs:
289289
path: ci/tmp/build/programs/self-extracting/clickhouse
290290

291291
build_arm_debug:
292-
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
292+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
293293
needs: [config_workflow, fast_test]
294294
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFybV9kZWJ1Zyk=') }}
295295
name: "Build (arm_debug)"
@@ -344,7 +344,7 @@ jobs:
344344
path: ci/tmp/*.deb
345345

346346
build_arm_asan_ubsan:
347-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
347+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
348348
needs: [config_workflow, fast_test]
349349
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFybV9hc2FuX3Vic2FuKQ==') }}
350350
name: "Build (arm_asan_ubsan)"
@@ -399,7 +399,7 @@ jobs:
399399
path: ci/tmp/*.deb
400400

401401
build_arm_ubsan:
402-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
402+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
403403
needs: [config_workflow, fast_test]
404404
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFybV91YnNhbik=') }}
405405
name: "Build (arm_ubsan)"
@@ -454,7 +454,7 @@ jobs:
454454
path: ci/tmp/*.deb
455455

456456
build_arm_binary:
457-
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
457+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
458458
needs: [config_workflow, fast_test]
459459
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFybV9iaW5hcnkp') }}
460460
name: "Build (arm_binary)"
@@ -502,7 +502,7 @@ jobs:
502502
path: ci/tmp/build/programs/self-extracting/clickhouse
503503

504504
build_amd_tsan:
505-
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
505+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
506506
needs: [config_workflow, fast_test]
507507
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFtZF90c2FuKQ==') }}
508508
name: "Build (amd_tsan)"
@@ -564,7 +564,7 @@ jobs:
564564
path: ci/tmp/*.deb
565565

566566
build_amd_msan:
567-
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
567+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
568568
needs: [config_workflow, fast_test]
569569
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFtZF9tc2FuKQ==') }}
570570
name: "Build (amd_msan)"
@@ -626,7 +626,7 @@ jobs:
626626
path: ci/tmp/*.deb
627627

628628
build_arm_tsan:
629-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
629+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
630630
needs: [config_workflow, fast_test]
631631
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFybV90c2FuKQ==') }}
632632
name: "Build (arm_tsan)"
@@ -681,7 +681,7 @@ jobs:
681681
path: ci/tmp/*.deb
682682

683683
build_arm_msan:
684-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
684+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
685685
needs: [config_workflow, fast_test]
686686
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'QnVpbGQgKGFybV9tc2FuKQ==') }}
687687
name: "Build (arm_msan)"
@@ -922,7 +922,7 @@ jobs:
922922
PYTHONUNBUFFERED=1 python3 -m praktika run 'Quick functional tests' --workflow "Community PR" --ci --timestamp
923923
924924
stateless_tests_amd_asan_ubsan_distributed_plan_parallel_1_2:
925-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
925+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
926926
needs: [build_amd_asan_ubsan, build_amd_debug, build_arm_binary, config_workflow, fast_test, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
927927
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbl91YnNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDEvMik=') }}
928928
name: "Stateless tests (amd_asan_ubsan, distributed plan, parallel, 1/2)"
@@ -970,7 +970,7 @@ jobs:
970970
PYTHONUNBUFFERED=1 python3 -m praktika run 'Stateless tests (amd_asan_ubsan, distributed plan, parallel, 1/2)' --workflow "Community PR" --ci --timestamp
971971
972972
stateless_tests_amd_asan_ubsan_distributed_plan_parallel_2_2:
973-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
973+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
974974
needs: [build_amd_asan_ubsan, build_amd_debug, build_arm_binary, config_workflow, fast_test, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
975975
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbl91YnNhbiwgZGlzdHJpYnV0ZWQgcGxhbiwgcGFyYWxsZWwsIDIvMik=') }}
976976
name: "Stateless tests (amd_asan_ubsan, distributed plan, parallel, 2/2)"
@@ -1114,7 +1114,7 @@ jobs:
11141114
PYTHONUNBUFFERED=1 python3 -m praktika run 'Stateless tests (amd_asan_ubsan, db disk, distributed plan, sequential, 2/2)' --workflow "Community PR" --ci --timestamp
11151115
11161116
stateless_tests_amd_debug_parallel:
1117-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
1117+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
11181118
needs: [build_amd_debug, config_workflow, fast_test]
11191119
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfZGVidWcsIHBhcmFsbGVsKQ==') }}
11201120
name: "Stateless tests (amd_debug, parallel)"
@@ -1210,7 +1210,7 @@ jobs:
12101210
PYTHONUNBUFFERED=1 python3 -m praktika run 'Stateless tests (amd_debug, sequential)' --workflow "Community PR" --ci --timestamp
12111211
12121212
stateless_tests_amd_tsan_parallel_1_2:
1213-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
1213+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
12141214
needs: [build_amd_debug, build_amd_tsan, build_arm_binary, config_workflow, fast_test, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
12151215
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDEvMik=') }}
12161216
name: "Stateless tests (amd_tsan, parallel, 1/2)"
@@ -1258,7 +1258,7 @@ jobs:
12581258
PYTHONUNBUFFERED=1 python3 -m praktika run 'Stateless tests (amd_tsan, parallel, 1/2)' --workflow "Community PR" --ci --timestamp
12591259
12601260
stateless_tests_amd_tsan_parallel_2_2:
1261-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
1261+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
12621262
needs: [build_amd_debug, build_amd_tsan, build_arm_binary, config_workflow, fast_test, stateless_tests_amd_debug_parallel, stateless_tests_arm_binary_parallel]
12631263
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfdHNhbiwgcGFyYWxsZWwsIDIvMik=') }}
12641264
name: "Stateless tests (amd_tsan, parallel, 2/2)"
@@ -3130,7 +3130,7 @@ jobs:
31303130
PYTHONUNBUFFERED=1 python3 -m praktika run 'Integration tests (amd_msan, 6/6)' --workflow "Community PR" --ci --timestamp
31313131
31323132
unit_tests_asan_ubsan:
3133-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
3133+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
31343134
needs: [build_amd_asan_ubsan, config_workflow, fast_test]
31353135
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'VW5pdCB0ZXN0cyAoYXNhbl91YnNhbik=') }}
31363136
name: "Unit tests (asan_ubsan)"
@@ -3178,7 +3178,7 @@ jobs:
31783178
PYTHONUNBUFFERED=1 python3 -m praktika run 'Unit tests (asan_ubsan)' --workflow "Community PR" --ci --timestamp
31793179
31803180
unit_tests_tsan:
3181-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
3181+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
31823182
needs: [build_amd_tsan, config_workflow, fast_test]
31833183
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'VW5pdCB0ZXN0cyAodHNhbik=') }}
31843184
name: "Unit tests (tsan)"
@@ -3226,7 +3226,7 @@ jobs:
32263226
PYTHONUNBUFFERED=1 python3 -m praktika run 'Unit tests (tsan)' --workflow "Community PR" --ci --timestamp
32273227
32283228
unit_tests_msan:
3229-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
3229+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
32303230
needs: [build_amd_msan, config_workflow, fast_test]
32313231
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'VW5pdCB0ZXN0cyAobXNhbik=') }}
32323232
name: "Unit tests (msan)"
@@ -3274,7 +3274,7 @@ jobs:
32743274
PYTHONUNBUFFERED=1 python3 -m praktika run 'Unit tests (msan)' --workflow "Community PR" --ci --timestamp
32753275
32763276
unit_tests_asan_ubsan_function_prop_fuzzer:
3277-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
3277+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
32783278
needs: [build_amd_asan_ubsan, config_workflow, fast_test]
32793279
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'VW5pdCB0ZXN0cyAoYXNhbl91YnNhbiwgZnVuY3Rpb25fcHJvcF9mdXp6ZXIp') }}
32803280
name: "Unit tests (asan_ubsan, function_prop_fuzzer)"
@@ -3322,7 +3322,7 @@ jobs:
33223322
PYTHONUNBUFFERED=1 python3 -m praktika run 'Unit tests (asan_ubsan, function_prop_fuzzer)' --workflow "Community PR" --ci --timestamp
33233323
33243324
unit_tests_tsan_function_prop_fuzzer:
3325-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
3325+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
33263326
needs: [build_amd_tsan, config_workflow, fast_test]
33273327
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'VW5pdCB0ZXN0cyAodHNhbiwgZnVuY3Rpb25fcHJvcF9mdXp6ZXIp') }}
33283328
name: "Unit tests (tsan, function_prop_fuzzer)"
@@ -3370,7 +3370,7 @@ jobs:
33703370
PYTHONUNBUFFERED=1 python3 -m praktika run 'Unit tests (tsan, function_prop_fuzzer)' --workflow "Community PR" --ci --timestamp
33713371
33723372
unit_tests_msan_function_prop_fuzzer:
3373-
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
3373+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
33743374
needs: [build_amd_msan, config_workflow, fast_test]
33753375
if: ${{ !cancelled() && !contains(needs.*.outputs.pipeline_status, 'failure') && !contains(needs.*.outputs.pipeline_status, 'undefined') && !contains(fromJson(needs.config_workflow.outputs.data).workflow_config.cache_success_base64, 'VW5pdCB0ZXN0cyAobXNhbiwgZnVuY3Rpb25fcHJvcF9mdXp6ZXIp') }}
33763376
name: "Unit tests (msan, function_prop_fuzzer)"

‎.github/workflows/regression-reusable-suite.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ jobs:
9999
--local
100100
--collect-service-logs
101101
--output ${{ inputs.output_format }}
102-
--attr project="${GITHUB_REPOSITORY}" project.id="${GITHUB_REPOSITORY_ID}" user.name="${GITHUB_ACTOR}" version="${{ fromJson(inputs.workflow_config).JOB_KV_DATA.version.string }}" package="$clickhouse_path" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name="$REPORT_JOB_NAME" job.retry=$GITHUB_RUN_ATTEMPT job.url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" arch="$(uname -i)"
102+
--attr project="${GITHUB_REPOSITORY}" project.id="${GITHUB_REPOSITORY_ID}" user.name="${GITHUB_ACTOR}" version="${{ fromJson(inputs.workflow_config).workflow_config.custom_data.version.string }}" package="$clickhouse_path" repository="https://github.com/Altinity/clickhouse-regression" commit.hash="$(git rev-parse HEAD)" job.name="$REPORT_JOB_NAME" job.retry=$GITHUB_RUN_ATTEMPT job.url="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}" arch="$(uname -i)"
103103
--cicd
104104
--log raw.log
105105
${{ inputs.flags != 'none' && inputs.flags || ''}}

0 commit comments

Comments
 (0)