From 6e13e4ee3fcacbbd129a7c3fcac5d2420043a1da Mon Sep 17 00:00:00 2001 From: Armel Soro Date: Thu, 12 Nov 2026 18:36:21 +0100 Subject: [PATCH 1/2] fix(ci): separate Hermeto into its own Renovate group Hermeto image bumps were grouped with UBI base image updates in the "all minor dependencies" PR. When Hermeto releases lack multi-arch support (e.g., missing arm64), they block unrelated Dockerfile base image updates from merging. Split docker minor updates into three groups: - hermeto: quay.io/konflux-ci/hermeto alone - All dockerfile images (minor): UBI base images - all minor dependencies: everything else (disabled) Assisted-by: Claude --- .github/renovate.json | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index b8dc7ce0f..dfc9a2cac 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -60,6 +60,27 @@ ], "automerge": false }, + { + "description": "Separate Hermeto image into its own PR to avoid blocking other docker updates", + "enabled": true, + "matchDatasources": [ + "docker" + ], + "matchPackageNames": [ + "quay.io/konflux-ci/hermeto" + ], + "matchUpdateTypes": [ + "minor" + ], + "groupName": "hermeto", + "groupSlug": "hermeto", + "matchBaseBranches": [ + "main", + "/^release-1\\.(9|\\d{2,}).*/", + "/^release-([2-9]|\\d{2,})\\..*/" + ], + "automerge": false + }, { "description": "Do generate PRs for minor dockerfile updates in 1.y ", "enabled": true, @@ -69,6 +90,8 @@ "matchUpdateTypes": [ "minor" ], + "groupName": "All dockerfile images (minor)", + "groupSlug": "dockerfile-minor", "matchBaseBranches": [ "main", "/^release-1\\.(9|\\d{2,}).*/", From a6535bc329c43022c84f26ab762829b1da3e1aec Mon Sep 17 00:00:00 2001 From: Armel Soro Date: Thu, 12 Nov 2026 18:38:36 +0100 Subject: [PATCH 2/2] fix(ci): move Hermeto rule after generic docker minor rule Renovate packageRules use last-match-wins for scalar fields. The Hermeto-specific rule must come after the generic docker minor rule so its groupName/groupSlug override takes effect. Assisted-by: Claude --- .github/renovate.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index dfc9a2cac..a666098b6 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -61,19 +61,16 @@ "automerge": false }, { - "description": "Separate Hermeto image into its own PR to avoid blocking other docker updates", + "description": "Do generate PRs for minor dockerfile updates in 1.y ", "enabled": true, "matchDatasources": [ "docker" ], - "matchPackageNames": [ - "quay.io/konflux-ci/hermeto" - ], "matchUpdateTypes": [ "minor" ], - "groupName": "hermeto", - "groupSlug": "hermeto", + "groupName": "All dockerfile images (minor)", + "groupSlug": "dockerfile-minor", "matchBaseBranches": [ "main", "/^release-1\\.(9|\\d{2,}).*/", @@ -82,16 +79,19 @@ "automerge": false }, { - "description": "Do generate PRs for minor dockerfile updates in 1.y ", + "description": "Separate Hermeto image into its own PR to avoid blocking other docker updates", "enabled": true, "matchDatasources": [ "docker" ], + "matchPackageNames": [ + "quay.io/konflux-ci/hermeto" + ], "matchUpdateTypes": [ "minor" ], - "groupName": "All dockerfile images (minor)", - "groupSlug": "dockerfile-minor", + "groupName": "hermeto", + "groupSlug": "hermeto", "matchBaseBranches": [ "main", "/^release-1\\.(9|\\d{2,}).*/",