Skip to content

chore(renovate): set RPM lockfile updates to automerge #302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Molter73 merged 4 commits into from
Feb 18, 2026
Merged

chore(renovate): set RPM lockfile updates to automerge #302

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01d190c
chore(renovate): set RPM lockfile updates to automerge
Molter73 Feb 17, 2026
bcc6125
Add all automerge options to lockFileMaintanance and move
Molter73 Feb 17, 2026
87fd5c4
Rewrite some renovate comments
Molter73 Feb 18, 2026
0533c8b
Fix typo
Molter73 Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions .github/renovate.json5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@
"branchConcurrentLimit": null,
// The number of PRs MintMaker can open in one hour, effectively in one run.
"prHourlyLimit": 6,
// Automerge all rpm-lockfile security updates. This is configured separately from other package managers.
// https://konflux-ci.dev/docs/mintmaker/rpm-lockfile/#how-to-enable-automerge-for-rpm-security-updates
"rpmVulnerabilityAutomerge": "ALL",
"timezone": "Etc/UTC",
"schedule": [
// Allowed syntax: https://docs.renovatebot.com/configuration-options/#schedule
Expand Down Expand Up @@ -61,6 +58,20 @@
"**/*konflux*.Containerfile",
],
},
// Turns on automerge for the RPM updates coming with CVE fixes.
// https://konflux-ci.dev/docs/mintmaker/rpm-lockfile/#how-to-enable-automerge-for-rpm-security-updates
"rpmVulnerabilityAutomerge": "ALL",
// Turns on automerge for the RPM updates without CVE fixes.
// The same settings as in `packageRules` below. See comments/explanations there.
"lockFileMaintenance": {
"automerge": true,
"automergeType": "pr",
"automergeStrategy": "squash",
"automergeSchedule": [
"at any time",
],
"platformAutomerge": true,
},
Copy link
Contributor

@msugakov msugakov Feb 17, 2026

Choose a reason for hiding this comment

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

  1. How about moving rpmVulnerabilityAutomerge to be also nearby lockFileMaintanance?
  2. I suggest adding all other usual automerge-related settings inside lockFileMaintenance. These would be
      "automergeType": "pr",
      "automergeStrategy": "squash",
      // Tell Renovate that it can automerge branches at any time of the day.
      "automergeSchedule": [
        "at any time",
      ],
      "platformAutomerge": true,

Copy link
Contributor Author

@Molter73 Molter73 Feb 17, 2026

Choose a reason for hiding this comment

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

Done.

Should we consider making these changes to the rest of the stackrox repos? (main, collector, scanner)

Copy link
Contributor

@msugakov msugakov Feb 18, 2026

Choose a reason for hiding this comment

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

Yes for collector and scanner.
In stackrox we don't have automerge, I believe.

Copy link
Contributor Author

@Molter73 Molter73 Feb 18, 2026

Choose a reason for hiding this comment

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

Ok, I can create the patches using this one as a template once it gets merged

"enabledManagers": [
// Restrict Renovate focus on Konflux things since we rely on GitHub's dependabot for everything else.
"tekton",
Expand Down