Skip to content

fix(ci): replace blanket Renovate disable with major-only block - #589

Merged
rm3l merged 1 commit into
redhat-developer:mainfrom
rm3l:fix/renovate-release-branch-updates
Oct 6, 2026
Merged

rm3l merged 1 commit into
redhat-developer:mainfrom
rm3l:fix/renovate-release-branch-updates

Conversation

@rm3l

@rm3l rm3l commented Oct 6, 2026

Copy link
Copy Markdown
Member

Summary

The Renovate config disabled all updates on release branches (enabled: false without matchUpdateTypes), then tried to selectively re-enable patch and digest updates. This never worked because Renovate skips dependencies entirely before determining the update type when the blanket disable matches — the re-enable rules had nothing to match against.

Replaces the three rules (disable-all, re-enable patch, re-enable digest) with a single rule that only disables major updates. Minor, patch, and digest updates are now implicitly allowed on release branches.

EOL branch rules (release-1.5 through 1.8) are unaffected — they use exact branch names and intentionally disable everything.

Same fix as redhat-developer/rhdh-must-gather#428, which was confirmed working after a Renovate cache bust.

Test plan

  • After merging, trigger a Renovate run and verify PRs are created for release branches
  • A cache-busting commit on active release branches may be needed (Renovate caches extraction results keyed by branch SHA)

The Renovate config disabled all updates on release branches
(enabled: false without matchUpdateTypes), then tried to selectively
re-enable patch and digest updates. This never worked because Renovate
skips dependencies entirely before determining the update type when
the blanket disable matches, so the re-enable rules had nothing to
match against.

Replace the three rules (disable-all, re-enable patch, re-enable
digest) with a single rule that only disables major updates. Minor,
patch, and digest updates are now implicitly allowed on release
branches.

EOL branch rules (release-1.5 through 1.8) are unaffected as they
use exact branch names and intentionally disable everything.

Assisted-by: Claude
@rm3l
rm3l requested a review from a team as a code owner October 6, 2026 10:24
@rhdh-qodo-merge

Copy link
Copy Markdown

PR Summary by Qodo

Allow non-major Renovate updates on active release branches

🐞 Bug fix ⚙️ Configuration changes 🕐 10-20 Minutes

Grey Divider

AI Description

• Replace the release-branch blanket disable with a major-only block so non-major updates can
 proceed.
• Preserve the existing full update bans on EOL release branches.
Diagram

graph TD
  A["Release branch"] --> B{"EOL branch?"} -- No --> D{"Major update?"} -- No --> F["Allow update"]
  B -- Yes --> C["Disable all"]
  D -- Yes --> E["Disable major"]
Loading
High-Level Assessment

The major-only block directly expresses the intended release-branch policy. Retaining a blanket disable with selective re-enable rules was considered but cannot produce the intended updates; separate branch configurations would add complexity without a clear benefit.

Files changed (1) +2 / -14

Bug fix (1) +2 / -14
renovate.jsonBlock only major updates on release branches +2/-14

Block only major updates on release branches

• Replaces the blanket release-branch disable and patch/digest re-enable rules with one major-only disable rule. Minor, patch, and digest updates are no longer blocked by that rule; the exact-name EOL branch rules remain unchanged.

.github/renovate.json

@sonarqubecloud

sonarqubecloud Bot commented Oct 6, 2026

Copy link
Copy Markdown

@rhdh-qodo-merge

Copy link
Copy Markdown

Code Review by Qodo

🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)

Grey Divider

Great, no issues found!

Qodo reviewed your code and found no material issues that require review

Grey Divider

Tip of the day
💡 Did you know, you can add REVIEW.md to your repo root and Qodo follows it on every PR

More tips ↗ | Customize Qodo ↗ | Qodo docs ↗

Grey Divider

Qodo Logo

@rhdh-qodo-merge

Copy link
Copy Markdown

Important

The /generate_labels command by Qodo is sunsetting on the 1st of October 2026 and will no longer be available. We recommend switching to the latest Qodo review capabilities. Learn more

@rm3l

rm3l commented Oct 6, 2026

Copy link
Copy Markdown
Member Author

Merging to verify the changes in Renovate

@rm3l

rm3l commented Oct 6, 2026

Copy link
Copy Markdown
Member Author

/cherrypick release-2.1
/cherrypick release-1.9

1.10 will be coming up later.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@rm3l: once the present PR merges, I will cherry-pick it on top of release-1.9, release-2.1 in new PRs and assign them to you.

Details

In response to this:

/cherrypick release-2.1
/cherrypick release-1.9

1.10 will be coming up later.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@rm3l
rm3l merged commit 41e9970 into redhat-developer:main Oct 6, 2026
8 checks passed
@rm3l
rm3l deleted the fix/renovate-release-branch-updates branch October 6, 2026 10:26
@openshift-cherrypick-robot

Copy link
Copy Markdown

@rm3l: new pull request created: #590

Details

In response to this:

/cherrypick release-2.1
/cherrypick release-1.9

1.10 will be coming up later.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot

Copy link
Copy Markdown

@rm3l: #589 failed to apply on top of branch "release-1.9":

Applying: fix(ci): replace blanket Renovate disable with major-only block
Using index info to reconstruct a base tree...
M	.github/renovate.json
Falling back to patching base and 3-way merge...
Auto-merging .github/renovate.json
CONFLICT (content): Merge conflict in .github/renovate.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 fix(ci): replace blanket Renovate disable with major-only block

Details

In response to this:

/cherrypick release-2.1
/cherrypick release-1.9

1.10 will be coming up later.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants