Skip to content

Commit b02789e

Browse files
arthurpassosarthurpassos
authored
Merge branch 'antalya-25.6.5' into export_mt_part_to_object_storage
2 parents 4bac44a + f7fed0f commit b02789e

File tree

38 files changed

+352
-1226
lines changed

38 files changed

+352
-1226
lines changed

‎.github/workflows/backport_branches.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ jobs:
533533
fi
534534
535535
install_packages_release:
536-
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
536+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
537537
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_amd_release]
538538
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAocmVsZWFzZSk=') }}
539539
name: "Install packages (release)"
@@ -574,7 +574,7 @@ jobs:
574574
fi
575575
576576
install_packages_aarch64:
577-
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
577+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
578578
needs: [config_workflow, dockers_build_amd, dockers_build_arm, build_arm_release]
579579
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYWFyY2g2NCk=') }}
580580
name: "Install packages (aarch64)"
@@ -1379,24 +1379,24 @@ jobs:
13791379

13801380
RegressionTestsRelease:
13811381
needs: [config_workflow, build_amd_release]
1382-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->')}}
1382+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
13831383
uses: ./.github/workflows/regression.yml
13841384
secrets: inherit
13851385
with:
13861386
runner_type: altinity-on-demand, altinity-regression-tester
1387-
commit: 5723e20cbc49b347114c7b90c7316a44dafa5328
1387+
commit: 38b4f3c4cbcf7b38c97e16793c210a1496075af7
13881388
arch: release
13891389
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
13901390
timeout_minutes: 300
13911391
workflow_config: ${{ needs.config_workflow.outputs.data }}
13921392
RegressionTestsAarch64:
13931393
needs: [config_workflow, build_arm_release]
1394-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64-->')}}
1394+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
13951395
uses: ./.github/workflows/regression.yml
13961396
secrets: inherit
13971397
with:
13981398
runner_type: altinity-on-demand, altinity-regression-tester-aarch64
1399-
commit: 5723e20cbc49b347114c7b90c7316a44dafa5328
1399+
commit: 38b4f3c4cbcf7b38c97e16793c210a1496075af7
14001400
arch: aarch64
14011401
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
14021402
timeout_minutes: 300

‎.github/workflows/master.yml‎

Lines changed: 17 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -202,47 +202,6 @@ jobs:
202202
python3 -m praktika run 'Dockers Build (multiplatform manifest)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
203203
fi
204204
205-
build_amd_tidy:
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, 'QnVpbGQgKGFtZF90aWR5KQ==') }}
209-
name: "Build (amd_tidy)"
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 'Build (amd_tidy)' --workflow "MasterCI" --ci |& ts '[%Y-%m-%d %H:%M:%S]' | tee ./ci/tmp/job.log
242-
else
243-
python3 -m praktika run 'Build (amd_tidy)' --workflow "MasterCI" --ci |& tee ./ci/tmp/job.log
244-
fi
245-
246205
build_amd_debug:
247206
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
248207
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
@@ -655,7 +614,7 @@ jobs:
655614
656615
build_amd_darwin:
657616
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
658-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
617+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
659618
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kYXJ3aW4p') }}
660619
name: "Build (amd_darwin)"
661620
outputs:
@@ -696,7 +655,7 @@ jobs:
696655
697656
build_arm_darwin:
698657
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
699-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
658+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
700659
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9kYXJ3aW4p') }}
701660
name: "Build (arm_darwin)"
702661
outputs:
@@ -737,7 +696,7 @@ jobs:
737696
738697
build_arm_v80compat:
739698
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
740-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
699+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
741700
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV92ODBjb21wYXQp') }}
742701
name: "Build (arm_v80compat)"
743702
outputs:
@@ -778,7 +737,7 @@ jobs:
778737
779738
build_amd_freebsd:
780739
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
781-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
740+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
782741
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9mcmVlYnNkKQ==') }}
783742
name: "Build (amd_freebsd)"
784743
outputs:
@@ -819,7 +778,7 @@ jobs:
819778
820779
build_ppc64le:
821780
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
822-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
781+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
823782
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHBwYzY0bGUp') }}
824783
name: "Build (ppc64le)"
825784
outputs:
@@ -860,7 +819,7 @@ jobs:
860819
861820
build_amd_compat:
862821
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
863-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
822+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
864823
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9jb21wYXQp') }}
865824
name: "Build (amd_compat)"
866825
outputs:
@@ -901,7 +860,7 @@ jobs:
901860
902861
build_amd_musl:
903862
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
904-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
863+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
905864
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tdXNsKQ==') }}
906865
name: "Build (amd_musl)"
907866
outputs:
@@ -942,7 +901,7 @@ jobs:
942901
943902
build_riscv64:
944903
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
945-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
904+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
946905
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHJpc2N2NjQp') }}
947906
name: "Build (riscv64)"
948907
outputs:
@@ -983,7 +942,7 @@ jobs:
983942
984943
build_s390x:
985944
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
986-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
945+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
987946
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKHMzOTB4KQ==') }}
988947
name: "Build (s390x)"
989948
outputs:
@@ -1024,7 +983,7 @@ jobs:
1024983
1025984
build_loongarch64:
1026985
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
1027-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
986+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
1028987
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGxvb25nYXJjaDY0KQ==') }}
1029988
name: "Build (loongarch64)"
1030989
outputs:
@@ -1065,7 +1024,7 @@ jobs:
10651024
10661025
build_fuzzers:
10671026
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
1068-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_tidy, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
1027+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_debug, build_amd_release, build_amd_asan, build_amd_tsan, build_amd_msan, build_amd_ubsan, build_amd_binary, build_arm_release, build_arm_coverage, build_arm_binary]
10691028
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGZ1enplcnMp') }}
10701029
name: "Build (fuzzers)"
10711030
outputs:
@@ -1351,7 +1310,7 @@ jobs:
13511310
fi
13521311
13531312
install_packages_release:
1354-
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
1313+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
13551314
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_release]
13561315
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAocmVsZWFzZSk=') }}
13571316
name: "Install packages (release)"
@@ -1392,7 +1351,7 @@ jobs:
13921351
fi
13931352
13941353
install_packages_aarch64:
1395-
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker-aarch64]
1354+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester-aarch64]
13961355
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_arm_release]
13971356
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'SW5zdGFsbCBwYWNrYWdlcyAoYWFyY2g2NCk=') }}
13981357
name: "Install packages (aarch64)"
@@ -4247,24 +4206,24 @@ jobs:
42474206

42484207
RegressionTestsRelease:
42494208
needs: [config_workflow, build_amd_release]
4250-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->')}}
4209+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression')}}
42514210
uses: ./.github/workflows/regression.yml
42524211
secrets: inherit
42534212
with:
42544213
runner_type: altinity-on-demand, altinity-regression-tester
4255-
commit: 5723e20cbc49b347114c7b90c7316a44dafa5328
4214+
commit: 38b4f3c4cbcf7b38c97e16793c210a1496075af7
42564215
arch: release
42574216
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
42584217
timeout_minutes: 300
42594218
workflow_config: ${{ needs.config_workflow.outputs.data }}
42604219
RegressionTestsAarch64:
42614220
needs: [config_workflow, build_arm_release]
4262-
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression-->') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64-->')}}
4221+
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_regression') && !contains(fromJson(needs.config_workflow.outputs.data).pull_request.body, '[x] <!---ci_exclude_aarch64')}}
42634222
uses: ./.github/workflows/regression.yml
42644223
secrets: inherit
42654224
with:
42664225
runner_type: altinity-on-demand, altinity-regression-tester-aarch64
4267-
commit: 5723e20cbc49b347114c7b90c7316a44dafa5328
4226+
commit: 38b4f3c4cbcf7b38c97e16793c210a1496075af7
42684227
arch: aarch64
42694228
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
42704229
timeout_minutes: 300
@@ -4296,7 +4255,6 @@ jobs:
42964255
- dockers_build_amd
42974256
- dockers_build_arm
42984257
- dockers_build_multiplatform_manifest
4299-
- build_amd_tidy
43004258
- build_amd_debug
43014259
- build_amd_release
43024260
- build_amd_asan

0 commit comments

Comments
 (0)