Skip to content

Commit 3862cef

Browse files
authored
ci: fix misconfigured on_job_failure (#13119)
Follow-up PR for #12837. The above PR allowed `main` and release branches to not be interrupted by new commits, but it unintentionally would cancel all jobs if even one job failed in the pipeline. This could be remediated by manually retrying the pipeline for the majority of cases, but poses an issue where it will cancel the release failure notification job for release pipelines. With this change: - Initial commit pipeline failed on download job but kept running the tests - As soon as the second commit got pushed, it cancelled the remaining jobs on the first pipeline (not marked cancelled because it already failed). <img width="777" alt="Screenshot 2025-04-08 at 4 14 31 PM" src="https://github.com/user-attachments/assets/a708cfdb-0792-48a9-a9f1-4f585fd476af" /> ## Checklist - [x] PR author has checked that all the criteria below are met - The PR description includes an overview of the change - The PR description articulates the motivation for the change - The change includes tests OR the PR description describes a testing strategy - The PR description notes risks associated with the change, if any - Newly-added code is easy to change - The change follows the [library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) - The change includes or references documentation updates if necessary - Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Reviewer has checked that all the criteria below are met - Title is accurate - All changes are related to the pull request's stated goal - Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes - Testing strategy adequately addresses listed risks - Newly-added code is easy to change - Release note makes sense to a user of the library - If necessary, author has acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment - Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
1 parent 1a006d9 commit 3862cef

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,17 @@ variables:
1313
default:
1414
interruptible: true
1515

16+
# trigger new commit cancel
1617
workflow:
1718
auto_cancel:
1819
on_new_commit: interruptible
19-
on_job_failure: all
2020
rules:
2121
- if: $CI_COMMIT_BRANCH == 'main'
2222
auto_cancel:
2323
on_new_commit: none
24-
on_job_failure: none
2524
- if: $CI_COMMIT_BRANCH =~ /^[0-9]+\.[0-9]+$/
2625
auto_cancel:
2726
on_new_commit: none
28-
on_job_failure: none
2927
- when: always
3028

3129
include:

0 commit comments

Comments
 (0)