Skip to content
Open
Changes from all commits
Commits
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
19 changes: 16 additions & 3 deletions .github/renovate.json5
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,22 @@
"**/*konflux*.Containerfile",
],
},
// 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",
// RPM lockfile updates need to be set explicitly to automerge, separately from other package managers.
"lockFileMaintanance": {
"automerge": true,
// A known issue is that some non-Konflux CI jobs currently fail, which may prevent successful auto-merging with a "branch" auto-merge setting.
// Therefore, we use PR merge type and have automation approve PRs.
"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

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

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)

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