Skip to content

Commit efd42b3

Browse files
strtgbbstrtgbb
authored
Merge pull request #907 from Altinity/cicd-rebase-25.6.2.5-stable
25.6 more fixes
2 parents 6ab7f9e + 6a9cbc4 commit efd42b3

File tree

12 files changed

+75
-32
lines changed

12 files changed

+75
-32
lines changed

‎.github/workflows/backport_branches.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,7 +1366,7 @@ jobs:
13661366
secrets: inherit
13671367
with:
13681368
docker_image: altinityinfra/clickhouse-server
1369-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1369+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
13701370
tag-suffix: ${{ matrix.suffix }}
13711371
GrypeScanKeeper:
13721372
needs: [config_workflow, docker_keeper_image]
@@ -1375,7 +1375,7 @@ jobs:
13751375
secrets: inherit
13761376
with:
13771377
docker_image: altinityinfra/clickhouse-keeper
1378-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1378+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
13791379

13801380
RegressionTestsRelease:
13811381
needs: [config_workflow, build_amd_release]

‎.github/workflows/master.yml‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,47 @@ jobs:
202202
python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
203203
fi
204204
205+
fast_test:
206+
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
207+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
208+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'RmFzdCB0ZXN0') }}
209+
name: "Fast test"
210+
outputs:
211+
data: ${{ steps.run.outputs.DATA }}
212+
steps:
213+
- name: Checkout code
214+
uses: actions/checkout@v4
215+
with:
216+
ref: ${{ env.CHECKOUT_REF }}
217+
218+
- name: Setup
219+
uses: ./.github/actions/runner_setup
220+
221+
- name: Prepare env script
222+
run: |
223+
rm -rf ./ci/tmp ./ci/tmp ./ci/tmp
224+
mkdir -p ./ci/tmp ./ci/tmp ./ci/tmp
225+
cat > ./ci/tmp/praktika_setup_env.sh << 'ENV_SETUP_SCRIPT_EOF'
226+
export PYTHONPATH=./ci:.:
227+
cat > ./ci/tmp/workflow_config_masterci.json << 'EOF'
228+
${{ needs.config_workflow.outputs.data }}
229+
EOF
230+
cat > ./ci/tmp/workflow_status.json << 'EOF'
231+
${{ toJson(needs) }}
232+
EOF
233+
ENV_SETUP_SCRIPT_EOF
234+
235+
- name: Run
236+
id: run
237+
run: |
238+
. ./ci/tmp/praktika_setup_env.sh
239+
set -o pipefail
240+
if command -v ts &> /dev/null; then
241+
python3 -m praktika run 'Fast test' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
242+
else
243+
python3 -m praktika run 'Fast test' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
244+
fi
245+
205246
build_amd_tidy:
206247
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
207248
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
@@ -4726,7 +4767,7 @@ jobs:
47264767
secrets: inherit
47274768
with:
47284769
docker_image: altinityinfra/clickhouse-server
4729-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4770+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
47304771
tag-suffix: ${{ matrix.suffix }}
47314772
GrypeScanKeeper:
47324773
needs: [config_workflow, docker_keeper_image]
@@ -4735,7 +4776,7 @@ jobs:
47354776
secrets: inherit
47364777
with:
47374778
docker_image: altinityinfra/clickhouse-keeper
4738-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4779+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
47394780

47404781
RegressionTestsRelease:
47414782
needs: [config_workflow, build_amd_release]
@@ -4788,6 +4829,7 @@ jobs:
47884829
- dockers_build_amd
47894830
- dockers_build_arm
47904831
- dockers_build_multiplatform_manifest
4832+
- fast_test
47914833
- build_amd_tidy
47924834
- build_amd_debug
47934835
- build_amd_release

‎.github/workflows/merge_queue.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ jobs:
335335
secrets: inherit
336336
with:
337337
docker_image: altinityinfra/clickhouse-server
338-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
338+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
339339
tag-suffix: ${{ matrix.suffix }}
340340
GrypeScanKeeper:
341341
needs: [config_workflow, docker_keeper_image]
@@ -344,7 +344,7 @@ jobs:
344344
secrets: inherit
345345
with:
346346
docker_image: altinityinfra/clickhouse-keeper
347-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
347+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
348348

349349
RegressionTestsRelease:
350350
needs: [config_workflow, build_amd_release]

‎.github/workflows/nightly_fuzzers.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ jobs:
241241
secrets: inherit
242242
with:
243243
docker_image: altinityinfra/clickhouse-server
244-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
244+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
245245
tag-suffix: ${{ matrix.suffix }}
246246
GrypeScanKeeper:
247247
needs: [config_workflow, docker_keeper_image]
@@ -250,7 +250,7 @@ jobs:
250250
secrets: inherit
251251
with:
252252
docker_image: altinityinfra/clickhouse-keeper
253-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
253+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
254254

255255
RegressionTestsRelease:
256256
needs: [config_workflow, build_amd_release]

‎.github/workflows/nightly_jepsen.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ jobs:
241241
secrets: inherit
242242
with:
243243
docker_image: altinityinfra/clickhouse-server
244-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
244+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
245245
tag-suffix: ${{ matrix.suffix }}
246246
GrypeScanKeeper:
247247
needs: [config_workflow, docker_keeper_image]
@@ -250,7 +250,7 @@ jobs:
250250
secrets: inherit
251251
with:
252252
docker_image: altinityinfra/clickhouse-keeper
253-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
253+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
254254

255255
RegressionTestsRelease:
256256
needs: [config_workflow, build_amd_release]

‎.github/workflows/nightly_statistics.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
secrets: inherit
114114
with:
115115
docker_image: altinityinfra/clickhouse-server
116-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
116+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
117117
tag-suffix: ${{ matrix.suffix }}
118118
GrypeScanKeeper:
119119
needs: [config_workflow, docker_keeper_image]
@@ -122,7 +122,7 @@ jobs:
122122
secrets: inherit
123123
with:
124124
docker_image: altinityinfra/clickhouse-keeper
125-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
125+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
126126

127127
RegressionTestsRelease:
128128
needs: [config_workflow, build_amd_release]

‎.github/workflows/pull_request.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ jobs:
288288
289289
build_amd_debug:
290290
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
291-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
291+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
292292
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kZWJ1Zyk=') }}
293293
name: "Build (amd_debug)"
294294
outputs:
@@ -329,7 +329,7 @@ jobs:
329329
330330
build_amd_release:
331331
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
332-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
332+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
333333
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') }}
334334
name: "Build (amd_release)"
335335
outputs:
@@ -370,7 +370,7 @@ jobs:
370370
371371
build_amd_asan:
372372
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
373-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
373+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
374374
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9hc2FuKQ==') }}
375375
name: "Build (amd_asan)"
376376
outputs:
@@ -411,7 +411,7 @@ jobs:
411411
412412
build_amd_tsan:
413413
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
414-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
414+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
415415
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF90c2FuKQ==') }}
416416
name: "Build (amd_tsan)"
417417
outputs:
@@ -452,7 +452,7 @@ jobs:
452452
453453
build_amd_msan:
454454
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
455-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
455+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
456456
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tc2FuKQ==') }}
457457
name: "Build (amd_msan)"
458458
outputs:
@@ -493,7 +493,7 @@ jobs:
493493
494494
build_amd_ubsan:
495495
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
496-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
496+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
497497
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF91YnNhbik=') }}
498498
name: "Build (amd_ubsan)"
499499
outputs:
@@ -534,7 +534,7 @@ jobs:
534534
535535
build_amd_binary:
536536
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
537-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
537+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
538538
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9iaW5hcnkp') }}
539539
name: "Build (amd_binary)"
540540
outputs:
@@ -575,7 +575,7 @@ jobs:
575575
576576
build_arm_release:
577577
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
578-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
578+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
579579
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') }}
580580
name: "Build (arm_release)"
581581
outputs:
@@ -616,7 +616,7 @@ jobs:
616616
617617
build_arm_asan:
618618
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
619-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
619+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
620620
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9hc2FuKQ==') }}
621621
name: "Build (arm_asan)"
622622
outputs:
@@ -657,7 +657,7 @@ jobs:
657657
658658
build_arm_coverage:
659659
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
660-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
660+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
661661
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9jb3ZlcmFnZSk=') }}
662662
name: "Build (arm_coverage)"
663663
outputs:
@@ -698,7 +698,7 @@ jobs:
698698
699699
build_arm_binary:
700700
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
701-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, fast_test, build_amd_tidy]
701+
needs: [config_workflow, dockers_build_amd, dockers_build_arm]
702702
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9iaW5hcnkp') }}
703703
name: "Build (arm_binary)"
704704
outputs:
@@ -4728,7 +4728,7 @@ jobs:
47284728
secrets: inherit
47294729
with:
47304730
docker_image: altinityinfra/clickhouse-server
4731-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4731+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
47324732
tag-suffix: ${{ matrix.suffix }}
47334733
GrypeScanKeeper:
47344734
needs: [config_workflow, docker_keeper_image]
@@ -4737,7 +4737,7 @@ jobs:
47374737
secrets: inherit
47384738
with:
47394739
docker_image: altinityinfra/clickhouse-keeper
4740-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4740+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
47414741

47424742
RegressionTestsRelease:
47434743
needs: [config_workflow, build_amd_release]

‎.github/workflows/release_branches.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1774,7 +1774,7 @@ jobs:
17741774
secrets: inherit
17751775
with:
17761776
docker_image: altinityinfra/clickhouse-server
1777-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1777+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
17781778
tag-suffix: ${{ matrix.suffix }}
17791779
GrypeScanKeeper:
17801780
needs: [config_workflow, docker_keeper_image]
@@ -1783,7 +1783,7 @@ jobs:
17831783
secrets: inherit
17841784
with:
17851785
docker_image: altinityinfra/clickhouse-keeper
1786-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
1786+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
17871787

17881788
RegressionTestsRelease:
17891789
needs: [config_workflow, build_amd_release]

‎ci/defs/job_configs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class JobConfigs:
7575
runs_on=RunnerLabels.BUILDER_AMD,
7676
command="python3 ./ci/jobs/fast_test.py",
7777
# --network=host required for ec2 metadata http endpoint to work
78-
run_in_docker="altinityinfra/fasttest+--network=host+--volume=./ci/tmp/var/lib/clickhouse:/var/lib/clickhouse+--volume=./ci/tmp/etc/clickhouse-client:/etc/clickhouse-client+--volume=./ci/tmp/etc/clickhouse-server:/etc/clickhouse-server+--volume=./ci/tmp/var/log:/var/log",
78+
run_in_docker='altinityinfra/fasttest+--network=host+--volume=./ci/tmp/var/lib/clickhouse:/var/lib/clickhouse+--volume=./ci/tmp/etc/clickhouse-client:/etc/clickhouse-client+--volume=./ci/tmp/etc/clickhouse-server:/etc/clickhouse-server+--volume=./ci/tmp/var/log:/var/log+--env=AWS_ACCESS_KEY_ID="$AWS_ACCESS_KEY_ID"+--env=AWS_SECRET_ACCESS_KEY="$AWS_SECRET_ACCESS_KEY"',
7979
digest_config=Job.CacheDigestConfig(
8080
include_paths=[
8181
"./ci/jobs/fast_test.py",

‎ci/praktika/yaml_additional_templates.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class AltinityWorkflowTemplates:
4242
secrets: inherit
4343
with:
4444
docker_image: altinityinfra/clickhouse-server
45-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
45+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
4646
tag-suffix: ${{ matrix.suffix }}
4747
GrypeScanKeeper:
4848
needs: [config_workflow, docker_keeper_image]
@@ -51,7 +51,7 @@ class AltinityWorkflowTemplates:
5151
secrets: inherit
5252
with:
5353
docker_image: altinityinfra/clickhouse-keeper
54-
version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
54+
# version: ${{ fromJson(needs.config_workflow.outputs.data).custom_data.version.string }}
5555
5656
RegressionTestsRelease:
5757
needs: [config_workflow, build_amd_release]

0 commit comments

Comments
 (0)