Skip to content

RUM-14050: Disable auto-cancel on develop and feature branches#3602

Merged
abrooksv merged 1 commit into
developfrom
abrooks/disable-auto-cancel-develop
Jul 2, 2026
Merged

RUM-14050: Disable auto-cancel on develop and feature branches#3602
abrooksv merged 1 commit into
developfrom
abrooks/disable-auto-cancel-develop

Conversation

@abrooksv

@abrooksv abrooksv commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

What does this PR do?

Follow up to #3584

Change the fallback for auto-cancel to be none instead of the project setting

Motivation

I did not enough enough permissions in Gitlab to see that the project has auto-cancel turned on at the project level. CI Infra confirmed it is on. This means that when jobs were marked as interruptible, we started cancelling them on the develop and feature branches which was not the intention of #3584. This PR overrides the project setting to be none which restores our old behavior

@abrooksv abrooksv changed the title Disable auto-cancel on develop and feature branches RUM-14050: Disable auto-cancel on develop and feature branches Jul 2, 2026
@abrooksv
abrooksv marked this pull request as ready for review July 2, 2026 19:33
@abrooksv
abrooksv requested review from a team as code owners July 2, 2026 19:33

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 1a7f2a36ef

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

on_new_commit: interruptible # short-lived branches cancel on new commits
- when: always # develop, master, feature/*, tags: never auto-canceled
auto_cancel:
on_new_commit: none

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Preserve auto-cancel for short-lived MR pipelines

For merge request pipelines from non-develop/master/non-feature/* branches, GitLab does not set CI_COMMIT_BRANCH, so the first rule is skipped and this unconditional fallback now forces on_new_commit: none. That means the MR pipeline for a short-lived branch such as bugfix/foo will no longer be canceled on subsequent pushes even though the matching branch pipeline still uses interruptible; use CI_MERGE_REQUEST_SOURCE_BRANCH_NAME or exclude MR pipelines from this fallback to keep the intended short-lived behavior.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not relevant, we don't create MRs in GitLab, only use the CI system so only CI_COMMIT_BRANCH will be set

@codecov-commenter

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 72.83%. Comparing base (0443e2a) to head (1a7f2a3).
⚠️ Report is 2 commits behind head on develop.

Additional details and impacted files
@@             Coverage Diff             @@
##           develop    #3602      +/-   ##
===========================================
- Coverage    72.85%   72.83%   -0.03%     
===========================================
  Files          975      975              
  Lines        35277    35270       -7     
  Branches      5972     5974       +2     
===========================================
- Hits         25700    25686      -14     
- Misses        7915     7918       +3     
- Partials      1662     1666       +4     

see 44 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@abrooksv
abrooksv merged commit c1b8259 into develop Jul 2, 2026
27 checks passed
@abrooksv
abrooksv deleted the abrooks/disable-auto-cancel-develop branch July 2, 2026 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants