Skip to content

Commit 80f3b0f

Browse files
authored
Merge pull request #978 from Altinity/fix_regression_skipping
Antalya 25.6.5 Fix regression skipping
2 parents 41df33a + baab4f8 commit 80f3b0f

File tree

10 files changed

+22
-20
lines changed

10 files changed

+22
-20
lines changed

.github/workflows/backport_branches.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1507,7 +1507,7 @@ jobs:
15071507

15081508
RegressionTestsRelease:
15091509
needs: [config_workflow, build_amd_release]
1510-
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')}}
1510+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
15111511
uses: ./.github/workflows/regression.yml
15121512
secrets: inherit
15131513
with:
@@ -1519,7 +1519,7 @@ jobs:
15191519
workflow_config: ${{ needs.config_workflow.outputs.data }}
15201520
RegressionTestsAarch64:
15211521
needs: [config_workflow, build_arm_release]
1522-
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')}}
1522+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
15231523
uses: ./.github/workflows/regression.yml
15241524
secrets: inherit
15251525
with:

.github/workflows/master.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ jobs:
609609
EOF
610610
cat > ./ci/tmp/workflow_status.json << 'EOF'
611611
${{ toJson(needs) }}
612-
EOFUpdate reusable_build.yml
612+
EOF
613613
ENV_SETUP_SCRIPT_EOF
614614
615615
- name: Run
@@ -4610,7 +4610,7 @@ jobs:
46104610

46114611
RegressionTestsRelease:
46124612
needs: [config_workflow, build_amd_release]
4613-
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')}}
4613+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
46144614
uses: ./.github/workflows/regression.yml
46154615
secrets: inherit
46164616
with:
@@ -4622,7 +4622,7 @@ jobs:
46224622
workflow_config: ${{ needs.config_workflow.outputs.data }}
46234623
RegressionTestsAarch64:
46244624
needs: [config_workflow, build_arm_release]
4625-
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')}}
4625+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
46264626
uses: ./.github/workflows/regression.yml
46274627
secrets: inherit
46284628
with:

.github/workflows/merge_queue.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ jobs:
376376

377377
RegressionTestsRelease:
378378
needs: [config_workflow, build_amd_release]
379-
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')}}
379+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
380380
uses: ./.github/workflows/regression.yml
381381
secrets: inherit
382382
with:
@@ -388,7 +388,7 @@ jobs:
388388
workflow_config: ${{ needs.config_workflow.outputs.data }}
389389
RegressionTestsAarch64:
390390
needs: [config_workflow, build_arm_release]
391-
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')}}
391+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
392392
uses: ./.github/workflows/regression.yml
393393
secrets: inherit
394394
with:

.github/workflows/nightly_fuzzers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ jobs:
274274

275275
RegressionTestsRelease:
276276
needs: [config_workflow, build_amd_release]
277-
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')}}
277+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
278278
uses: ./.github/workflows/regression.yml
279279
secrets: inherit
280280
with:
@@ -286,7 +286,7 @@ jobs:
286286
workflow_config: ${{ needs.config_workflow.outputs.data }}
287287
RegressionTestsAarch64:
288288
needs: [config_workflow, build_arm_release]
289-
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')}}
289+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
290290
uses: ./.github/workflows/regression.yml
291291
secrets: inherit
292292
with:

.github/workflows/nightly_jepsen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ jobs:
274274

275275
RegressionTestsRelease:
276276
needs: [config_workflow, build_amd_release]
277-
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')}}
277+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
278278
uses: ./.github/workflows/regression.yml
279279
secrets: inherit
280280
with:
@@ -286,7 +286,7 @@ jobs:
286286
workflow_config: ${{ needs.config_workflow.outputs.data }}
287287
RegressionTestsAarch64:
288288
needs: [config_workflow, build_arm_release]
289-
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')}}
289+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
290290
uses: ./.github/workflows/regression.yml
291291
secrets: inherit
292292
with:

.github/workflows/nightly_statistics.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134

135135
RegressionTestsRelease:
136136
needs: [config_workflow, build_amd_release]
137-
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')}}
137+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
138138
uses: ./.github/workflows/regression.yml
139139
secrets: inherit
140140
with:
@@ -146,7 +146,7 @@ jobs:
146146
workflow_config: ${{ needs.config_workflow.outputs.data }}
147147
RegressionTestsAarch64:
148148
needs: [config_workflow, build_arm_release]
149-
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')}}
149+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
150150
uses: ./.github/workflows/regression.yml
151151
secrets: inherit
152152
with:

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3937,7 +3937,7 @@ jobs:
39373937

39383938
RegressionTestsRelease:
39393939
needs: [config_workflow, build_amd_release]
3940-
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')}}
3940+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
39413941
uses: ./.github/workflows/regression.yml
39423942
secrets: inherit
39433943
with:
@@ -3949,7 +3949,7 @@ jobs:
39493949
workflow_config: ${{ needs.config_workflow.outputs.data }}
39503950
RegressionTestsAarch64:
39513951
needs: [config_workflow, build_arm_release]
3952-
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')}}
3952+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
39533953
uses: ./.github/workflows/regression.yml
39543954
secrets: inherit
39553955
with:

.github/workflows/release_branches.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1865,7 +1865,7 @@ jobs:
18651865

18661866
RegressionTestsRelease:
18671867
needs: [config_workflow, build_amd_release]
1868-
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')}}
1868+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
18691869
uses: ./.github/workflows/regression.yml
18701870
secrets: inherit
18711871
with:
@@ -1877,7 +1877,7 @@ jobs:
18771877
workflow_config: ${{ needs.config_workflow.outputs.data }}
18781878
RegressionTestsAarch64:
18791879
needs: [config_workflow, build_arm_release]
1880-
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')}}
1880+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
18811881
uses: ./.github/workflows/regression.yml
18821882
secrets: inherit
18831883
with:

ci/praktika/native_jobs.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,9 @@ def check_affected_jobs():
383383

384384
affected_artifacts = []
385385
unaffected_jobs_with_artifacts = {}
386-
all_required_artifacts = set()
386+
# NOTE (strtgbb): We always want the build artifacts for our report and regression tests.
387+
# If we make FinishCIReport and regression tests into praktika jobs, we can remove this.
388+
all_required_artifacts = set(["CH_AMD_RELEASE", "CH_ARM_RELEASE"])
387389

388390
for job in workflow.jobs:
389391
# Skip native Praktika jobs

ci/praktika/yaml_additional_templates.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class AltinityWorkflowTemplates:
5959
6060
RegressionTestsRelease:
6161
needs: [config_workflow, build_amd_release]
62-
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')}}
62+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression')}}
6363
uses: ./.github/workflows/regression.yml
6464
secrets: inherit
6565
with:
@@ -71,7 +71,7 @@ class AltinityWorkflowTemplates:
7171
workflow_config: ${{ needs.config_workflow.outputs.data }}
7272
RegressionTestsAarch64:
7373
needs: [config_workflow, build_arm_release]
74-
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')}}
74+
if: ${{ !failure() && !cancelled() && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_regression') && !contains(github.event.pull_request.body, '[x] <!---ci_exclude_aarch64')}}
7575
uses: ./.github/workflows/regression.yml
7676
secrets: inherit
7777
with:

0 commit comments

Comments
 (0)