Skip to content

feat(konflux): set rpm-lockfile security updates to automerge#242

Merged
Molter73 merged 1 commit intomainfrom
mauro/konflux/auto-merge-rpm-security
Feb 5, 2026
Merged

feat(konflux): set rpm-lockfile security updates to automerge#242
Molter73 merged 1 commit intomainfrom
mauro/konflux/auto-merge-rpm-security

Conversation

@Molter73
Copy link
Contributor

@Molter73 Molter73 commented Feb 5, 2026

Description

For the main branch, all updates should be merged, we might want to change this for release branches.

For reference, see: https://konflux-ci.dev/docs/mintmaker/rpm-lockfile/#how-to-enable-automerge-for-rpm-security-updates

Checklist

  • Investigated and inspected CI test results
  • Updated documentation accordingly

Automated testing

  • Added unit tests
  • Added integration tests
  • Added regression tests

If any of these don't apply, please comment below.

Testing Performed

I believe there is no way to validate rpm-lockfile configurations other than checking than merging and hoping.

@Molter73 Molter73 requested a review from a team as a code owner February 5, 2026 10:04
"automergeSchedule": [
"at any time",
],
"rpmVulnerabilityAutomerge": "ALL",
Copy link
Contributor

@msugakov msugakov Feb 5, 2026

Choose a reason for hiding this comment

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

How did you deduce top-level packageRules to be the correct place for this rpmVulnerabilityAutomerge setting?

This setting is custom and certainly won't pass Renovate validation. If placed in an unlucky spot, I fear, may break configuration.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

How did you deduce packageRules to be the correct place for this rpmVulnerabilityAutomerge setting?

Guessing 🤷🏻‍♂️

This setting is custom and certainly won't pass Renovate validation. If placed in an unlucky spot, I fear, may break configuration.

I'm gonna request a review from the konflux team, they should be able to point us to the correct spot.
renovate-config-validator only complains about this field and the rpm-lockfiles manager:

 INFO: Validating .github/renovate.json5
ERROR: Found errors in configuration
       "file": ".github/renovate.json5",
       "errors": [
         {
           "topic": "Configuration Error",
           "message": "Invalid configuration option: packageRules[0].rpmVulnerabilityAutomerge"
         },
         {
           "topic": "Configuration Error",
           "message": "The following managers configured in enabledManagers are not supported: \"rpm-lockfile\""
         }
       ]

Copy link
Contributor Author

Choose a reason for hiding this comment

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

After reviewing this slack thread and some of its links, it seems like the rpmVulnerabilityAutomerge needs to be set at the top level of the configuration. It looks a bit weird to me still, but the https://github.com/openshift-kni/dpdk-base repo has it configured this way and it seems to work 🤷🏻‍♂️ .

Copy link
Contributor

Choose a reason for hiding this comment

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

It's still kind of guessing. I would suggest you request Konflux folks update the documentation you referred to to indicate the right place. It's like when you try to integrate a new library in your project and library's documentation shows exactly the code snippet you need but without any include-s/import-s so you're left to have the best kind of fun.

Copy link
Contributor

Choose a reason for hiding this comment

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

Another interesting thing for them to answer is how does it stack against all usual automerge* settings of Renovate.

For the `main` branch, all updates should be merged, we might want to
change this for release branches.

For reference, see: https://konflux-ci.dev/docs/mintmaker/rpm-lockfile/#how-to-enable-automerge-for-rpm-security-updates
@Molter73 Molter73 force-pushed the mauro/konflux/auto-merge-rpm-security branch from 2b3e149 to b106ea2 Compare February 5, 2026 10:32
@Molter73
Copy link
Contributor Author

Molter73 commented Feb 5, 2026

@msugakov, are you OK with the current change given it is the same as the one used on a working repo? Or do we still want someone from the konflux team to take a look?

@Molter73 Molter73 enabled auto-merge (squash) February 5, 2026 16:04
Copy link
Contributor

@msugakov msugakov left a comment

Choose a reason for hiding this comment

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

@Molter73 Molter73 merged commit 2e1d798 into main Feb 5, 2026
23 checks passed
@Molter73 Molter73 deleted the mauro/konflux/auto-merge-rpm-security branch February 5, 2026 16:19
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.

2 participants