From 1963b068d3b219aa55feedefe55be8f1df055941 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 20 May 2026 14:31:53 -0700 Subject: [PATCH] Switch epel10.repo and rhel10.repo to use a link to latest There's no super right answer here, but if we point to a specific minor release here it means we have to move all machines to it when we change it, and we have to remember to do so. If we just use '10' and depend on the link that points to the latest minor: lrwxrwxrwx. 1 root root 4 May 19 17:12 /srv/web/repo/rhel/rhel10/10 -> 10.2/ then we don't have to keep changing this all the time, it will just update when that link changes. This doesn't leave us an easy way to keep some hosts back to the old minor, but in practice we pretty much never do this anyhow. Signed-off-by: Kevin Fenzi --- files/common/epel10.repo | 9 +++++---- files/common/rhel10.repo | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/files/common/epel10.repo b/files/common/epel10.repo index 6c0fc38d62..9a0016fbdb 100644 --- a/files/common/epel10.repo +++ b/files/common/epel10.repo @@ -1,9 +1,10 @@ [epel] name=Extras Packages for Enterprise Linux $releasever - $basearch -# This is a bit too magic, esp. as we are using the infra. repo. and explicitly -# point to a 10.x variant ... might as well do the same here. +# We aren't using mirrormanager here, but pointing direct to our repos +# So, we want to just point to '10' here and depend on the link that exists +# to point us to the newest minor release. # baseurl=https://infrastructure.fedoraproject.org/pub/epel/$releasever${releasever_minor:+z}/Everything/$basearch/ -baseurl=https://infrastructure.fedoraproject.org/pub/epel/10.1/Everything/$basearch/ +baseurl=https://infrastructure.fedoraproject.org/pub/epel/10/Everything/$basearch/ enabled=1 gpgcheck=1 gpgkey=https://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-10 @@ -11,7 +12,7 @@ gpgkey=https://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-10 [epel-testing] name=Extras Packages for Enterprise Linux $releasever - $basearch # baseurl=https://infrastructure.fedoraproject.org/pub/epel/testing/$releasever${releasever_minor:+z}/Everything/$basearch/ -baseurl=https://infrastructure.fedoraproject.org/pub/epel/testing/10.1/Everything/$basearch/ +baseurl=https://infrastructure.fedoraproject.org/pub/epel/testing/10/Everything/$basearch/ enabled=0 gpgcheck=1 gpgkey=https://infrastructure.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-10 diff --git a/files/common/rhel10.repo b/files/common/rhel10.repo index 4079046d70..8e7a6917ce 100644 --- a/files/common/rhel10.repo +++ b/files/common/rhel10.repo @@ -12,24 +12,25 @@ gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg enabled=1 gpgcheck=1 -# NOTE: When you change the 10.x here also change it in the epel10.repo file. +# These are not using mirrormanager, so point to '10' which will use the link +# to the latest minor release. [rhel10-BaseOS] name = rhel10 BaseOS $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel10/10.1/repos/$basearch/baseos +baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel10/10/repos/$basearch/baseos gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release enabled=1 gpgcheck=1 [rhel10-AppStream] name = rhel10 AppStream $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel10/10.1/repos/$basearch/appstream +baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel10/10/repos/$basearch/appstream gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release enabled=1 gpgcheck=1 [rhel10-CRB] name = rhel10 CodeReadyBuilder $basearch -baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel10/10.1/repos/$basearch/crb +baseurl=https://infrastructure.fedoraproject.org/repo/rhel/rhel10/10/repos/$basearch/crb gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta,file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release enabled=1 gpgcheck=1