Skip to content

Commit 7981545

Browse files
strtgbbstrtgbb
authored
Merge pull request #1358 from Altinity/regression_fixes_25.8
Antalya 25.8 - Fix regression cancellation, reduce regression timeout, fix flaky check
2 parents 76a564f + ea4ff05 commit 7981545

File tree

7 files changed

+24
-24
lines changed

7 files changed

+24
-24
lines changed

‎.github/workflows/master.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4182,7 +4182,7 @@ jobs:
41824182
commit: b6ad0719560fc2e01298d287c7564d8e74ae915e
41834183
arch: x86
41844184
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
4185-
timeout_minutes: 300
4185+
timeout_minutes: 210
41864186
workflow_config: ${{ needs.config_workflow.outputs.data }}
41874187
RegressionTestsAarch64:
41884188
needs: [config_workflow, build_arm_binary]
@@ -4194,7 +4194,7 @@ jobs:
41944194
commit: b6ad0719560fc2e01298d287c7564d8e74ae915e
41954195
arch: aarch64
41964196
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
4197-
timeout_minutes: 300
4197+
timeout_minutes: 210
41984198
workflow_config: ${{ needs.config_workflow.outputs.data }}
41994199

42004200
SignRelease:

‎.github/workflows/pull_request.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ jobs:
279279
280280
build_amd_debug:
281281
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
282-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
282+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
283283
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9kZWJ1Zyk=') }}
284284
name: "Build (amd_debug)"
285285
outputs:
@@ -324,7 +324,7 @@ jobs:
324324
325325
build_amd_release:
326326
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
327-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
327+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
328328
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9yZWxlYXNlKQ==') }}
329329
name: "Build (amd_release)"
330330
outputs:
@@ -369,7 +369,7 @@ jobs:
369369
370370
build_amd_asan:
371371
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
372-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
372+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
373373
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9hc2FuKQ==') }}
374374
name: "Build (amd_asan)"
375375
outputs:
@@ -414,7 +414,7 @@ jobs:
414414
415415
build_amd_tsan:
416416
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
417-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
417+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
418418
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF90c2FuKQ==') }}
419419
name: "Build (amd_tsan)"
420420
outputs:
@@ -459,7 +459,7 @@ jobs:
459459
460460
build_amd_msan:
461461
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
462-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
462+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
463463
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9tc2FuKQ==') }}
464464
name: "Build (amd_msan)"
465465
outputs:
@@ -504,7 +504,7 @@ jobs:
504504
505505
build_amd_ubsan:
506506
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
507-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
507+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
508508
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF91YnNhbik=') }}
509509
name: "Build (amd_ubsan)"
510510
outputs:
@@ -549,7 +549,7 @@ jobs:
549549
550550
build_amd_binary:
551551
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
552-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
552+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
553553
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFtZF9iaW5hcnkp') }}
554554
name: "Build (amd_binary)"
555555
outputs:
@@ -594,7 +594,7 @@ jobs:
594594
595595
build_arm_release:
596596
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
597-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
597+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
598598
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9yZWxlYXNlKQ==') }}
599599
name: "Build (arm_release)"
600600
outputs:
@@ -639,7 +639,7 @@ jobs:
639639
640640
build_arm_coverage:
641641
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
642-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
642+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
643643
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9jb3ZlcmFnZSk=') }}
644644
name: "Build (arm_coverage)"
645645
outputs:
@@ -684,7 +684,7 @@ jobs:
684684
685685
build_arm_binary:
686686
runs-on: [self-hosted, altinity-on-demand, altinity-builder]
687-
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest]
687+
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, fast_test]
688688
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'QnVpbGQgKGFybV9iaW5hcnkp') }}
689689
name: "Build (arm_binary)"
690690
outputs:
@@ -2168,7 +2168,7 @@ jobs:
21682168
fi
21692169
21702170
stateless_tests_amd_asan_flaky_check:
2171-
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
2171+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
21722172
needs: [config_workflow, dockers_build_amd, dockers_build_arm, dockers_build_multiplatform_manifest, build_amd_asan]
21732173
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZmxha3kgY2hlY2sp') }}
21742174
name: "Stateless tests (amd_asan, flaky check)"
@@ -4048,7 +4048,7 @@ jobs:
40484048
commit: b6ad0719560fc2e01298d287c7564d8e74ae915e
40494049
arch: x86
40504050
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
4051-
timeout_minutes: 300
4051+
timeout_minutes: 210
40524052
workflow_config: ${{ needs.config_workflow.outputs.data }}
40534053
RegressionTestsAarch64:
40544054
needs: [config_workflow, build_arm_binary]
@@ -4060,7 +4060,7 @@ jobs:
40604060
commit: b6ad0719560fc2e01298d287c7564d8e74ae915e
40614061
arch: aarch64
40624062
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
4063-
timeout_minutes: 300
4063+
timeout_minutes: 210
40644064
workflow_config: ${{ needs.config_workflow.outputs.data }}
40654065

40664066
FinishCIReport:

‎.github/workflows/pull_request_community.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2398,7 +2398,7 @@ jobs:
23982398
fi
23992399
24002400
stateless_tests_amd_asan_flaky_check:
2401-
runs-on: [self-hosted, altinity-on-demand, altinity-style-checker]
2401+
runs-on: [self-hosted, altinity-on-demand, altinity-func-tester]
24022402
needs: [config_workflow, build_amd_asan]
24032403
if: ${{ !failure() && !cancelled() && !contains(fromJson(needs.config_workflow.outputs.data).cache_success_base64, 'U3RhdGVsZXNzIHRlc3RzIChhbWRfYXNhbiwgZmxha3kgY2hlY2sp') }}
24042404
name: "Stateless tests (amd_asan, flaky check)"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,24 +168,24 @@ jobs:
168168
exit $EXITCODE
169169

170170
- name: 📊 Set Commit Status
171-
if: always() && inputs.set_commit_status
171+
if: ${{ !cancelled() && inputs.set_commit_status }}
172172
env:
173173
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
174174
JOB_OUTCOME: ${{ steps.run_suite.outcome }}
175175
SUITE_NAME: ${{ format('Regression {0} {1}{2}', inputs.runner_arch, inputs.job_name != '' && inputs.job_name || inputs.suite_name, inputs.part != '' && format('_{0}', inputs.part) || '') }}
176176
run: python3 .github/set_builds_status.py
177177

178178
- name: 📝 Create and upload logs
179-
if: always()
179+
if: ${{ !cancelled() }}
180180
run: .github/create_and_upload_logs.sh 1
181181

182182
- name: 📤 Upload logs to results database
183-
if: always()
183+
if: ${{ !cancelled() }}
184184
timeout-minutes: 20
185185
run: .github/upload_results_to_database.sh 1
186186

187187
- uses: actions/upload-artifact@v4
188-
if: always()
188+
if: ${{ !cancelled() }}
189189
with:
190190
name: ${{ format('{0}{1}-artifacts-{2}{3}', inputs.job_name != '' && inputs.job_name || inputs.suite_name, inputs.part != '' && format('_{0}', inputs.part) || '', inputs.runner_arch, contains(inputs.extra_args, '--use-keeper') && '_keeper' || '_zookeeper') }}
191191
path: ${{ env.artifact_paths }}

‎ci/defs/job_configs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ class JobConfigs:
348348
stateless_tests_flaky_pr_jobs = common_ft_job_config.parametrize(
349349
Job.ParamSet(
350350
parameter="amd_asan, flaky check",
351-
runs_on=RunnerLabels.AMD_SMALL_MEM,
351+
runs_on=RunnerLabels.FUNC_TESTER_AMD,
352352
requires=[ArtifactNames.CH_AMD_ASAN],
353353
),
354354
)

‎ci/praktika/yaml_additional_templates.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class AltinityWorkflowTemplates:
7272
commit: {REGRESSION_HASH}
7373
arch: x86
7474
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
75-
timeout_minutes: 300
75+
timeout_minutes: 210
7676
workflow_config: ${{ needs.config_workflow.outputs.data }}
7777
RegressionTestsAarch64:
7878
needs: [config_workflow, build_arm_binary]
@@ -84,7 +84,7 @@ class AltinityWorkflowTemplates:
8484
commit: {REGRESSION_HASH}
8585
arch: aarch64
8686
build_sha: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
87-
timeout_minutes: 300
87+
timeout_minutes: 210
8888
workflow_config: ${{ needs.config_workflow.outputs.data }}
8989
""",
9090
"SignRelease": r"""

‎ci/workflows/pull_request.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
job.set_dependency(
3535
[
3636
# JobNames.STYLE_CHECK, # NOTE (strtgbb): we don't run style check
37-
# JobNames.FAST_TEST, # NOTE (strtgbb): this takes too long, revisit later
37+
JobNames.FAST_TEST,
3838
# JobConfigs.tidy_build_arm_jobs[0].name, # NOTE (strtgbb): this takes too long, revisit later
3939
]
4040
)

0 commit comments

Comments
 (0)