Skip to content

Commit 25ab3a2

Browse files
committed
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 conforma#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.
1 parent c0b3710 commit 25ab3a2

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

ubi.repo

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
[ubi-9-baseos-rpms]
1+
[ubi-9-for-$basearch-baseos-rpms]
22
name = Red Hat Universal Base Image 9 (RPMs) - BaseOS
33
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/os
44
enabled = 1
55
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
66
gpgcheck = 1
77

8-
[ubi-9-baseos-debug-rpms]
8+
[ubi-9-for-$basearch-baseos-debug-rpms]
99
name = Red Hat Universal Base Image 9 (Debug RPMs) - BaseOS
1010
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/debug
1111
enabled = 0
1212
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
1313
gpgcheck = 1
1414

15-
[ubi-9-baseos-source-rpms]
15+
[ubi-9-for-$basearch-baseos-source-rpms]
1616
name = Red Hat Universal Base Image 9 (Source RPMs) - BaseOS
1717
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/baseos/source/SRPMS
1818
enabled = 0
1919
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
2020
gpgcheck = 1
2121

22-
[ubi-9-appstream-rpms]
22+
[ubi-9-for-$basearch-appstream-rpms]
2323
name = Red Hat Universal Base Image 9 (RPMs) - AppStream
2424
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/os
2525
enabled = 1
2626
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
2727
gpgcheck = 1
2828

29-
[ubi-9-appstream-debug-rpms]
29+
[ubi-9-for-$basearch-appstream-debug-rpms]
3030
name = Red Hat Universal Base Image 9 (Debug RPMs) - AppStream
3131
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/debug
3232
enabled = 0
3333
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
3434
gpgcheck = 1
3535

36-
[ubi-9-appstream-source-rpms]
36+
[ubi-9-for-$basearch-appstream-source-rpms]
3737
name = Red Hat Universal Base Image 9 (Source RPMs) - AppStream
3838
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/appstream/source/SRPMS
3939
enabled = 0
4040
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
4141
gpgcheck = 1
4242

43-
[ubi-9-codeready-builder-rpms]
43+
[ubi-9-for-$basearch-codeready-builder-rpms]
4444
name = Red Hat Universal Base Image 9 (RPMs) - CodeReady Builder
4545
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/os
4646
enabled = 1
4747
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
4848
gpgcheck = 1
4949

50-
[ubi-9-codeready-builder-debug-rpms]
50+
[ubi-9-for-$basearch-codeready-builder-debug-rpms]
5151
name = Red Hat Universal Base Image 9 (Debug RPMs) - CodeReady Builder
5252
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/debug
5353
enabled = 0
5454
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
5555
gpgcheck = 1
5656

57-
[ubi-9-codeready-builder-source-rpms]
57+
[ubi-9-for-$basearch-codeready-builder-source-rpms]
5858
name = Red Hat Universal Base Image 9 (Source RPMs) - CodeReady Builder
5959
baseurl = https://cdn-ubi.redhat.com/content/public/ubi/dist/ubi9/9/$basearch/codeready-builder/source/SRPMS
6060
enabled = 0

0 commit comments

Comments
 (0)