From 25ab3a24d98f973de10b65b4ecd6f1bf3482be37 Mon Sep 17 00:00:00 2001 From: Simon Baird Date: Thu, 9 Oct 2025 16:25:23 -0400 Subject: [PATCH] Use longer repoids in ubi.repo IIUC this file is used by Mintmaker. It was added in EC-1244 to prevent Mintmaker from failing. More specifically it's used by `rpm-lockfile-prototype` which IIUC Mintmaker is using to freshen rpm lockfiles. For this change I'm hoping to prevent the "good" repoids (such as "ubi-9-for-aarch64-baseos-rpms" from being converted to "bad" repoids (such as "ubi-9-baseos-rpms") in our `rpms.lock.yaml file`, in PRs such as #2934. The "bad" repoids can produce Conforma violations, since the shorter repoids are not in the allowed repo list, visible [here](https://github.com/release-engineering/rhtap-ec-policy/blob/main/data/known_rpm_repositories.yml). See also the `hack/update-rpm-lock.sh` script in this repo, which is our own custom script we've used in the past for updating the rpm lockfile. --- ubi.repo | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ubi.repo b/ubi.repo index aa4f95349..726c7c8d1 100644 --- a/ubi.repo +++ b/ubi.repo @@ -1,60 +1,60 @@ -[ubi-9-baseos-rpms] +[ubi-9-for-$basearch-baseos-rpms] name = Red Hat Universal Base Image 9 (RPMs) - BaseOS baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/os enabled = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -[ubi-9-baseos-debug-rpms] +[ubi-9-for-$basearch-baseos-debug-rpms] name = Red Hat Universal Base Image 9 (Debug RPMs) - BaseOS baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/debug enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -[ubi-9-baseos-source-rpms] +[ubi-9-for-$basearch-baseos-source-rpms] name = Red Hat Universal Base Image 9 (Source RPMs) - BaseOS baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/source/SRPMS enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -[ubi-9-appstream-rpms] +[ubi-9-for-$basearch-appstream-rpms] name = Red Hat Universal Base Image 9 (RPMs) - AppStream baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/os enabled = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -[ubi-9-appstream-debug-rpms] +[ubi-9-for-$basearch-appstream-debug-rpms] name = Red Hat Universal Base Image 9 (Debug RPMs) - AppStream baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/debug enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -[ubi-9-appstream-source-rpms] +[ubi-9-for-$basearch-appstream-source-rpms] name = Red Hat Universal Base Image 9 (Source RPMs) - AppStream baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/source/SRPMS enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -[ubi-9-codeready-builder-rpms] +[ubi-9-for-$basearch-codeready-builder-rpms] name = Red Hat Universal Base Image 9 (RPMs) - CodeReady Builder baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/os enabled = 1 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -[ubi-9-codeready-builder-debug-rpms] +[ubi-9-for-$basearch-codeready-builder-debug-rpms] name = Red Hat Universal Base Image 9 (Debug RPMs) - CodeReady Builder baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/debug enabled = 0 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release gpgcheck = 1 -[ubi-9-codeready-builder-source-rpms] +[ubi-9-for-$basearch-codeready-builder-source-rpms] name = Red Hat Universal Base Image 9 (Source RPMs) - CodeReady Builder baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/source/SRPMS enabled = 0