From 2d1f43d751feef25d08f49770dbe76121e3cec2e Mon Sep 17 00:00:00 2001 From: Michael Armijo Date: Thu, 5 Sep 2024 12:12:56 -0600 Subject: [PATCH] fedora-archive.repo: use both EOL and non-EOL locations Include both the EOL and non-EOL repo locations in the baseurl list to simplify maintenance. This update benefits two kola tests and the RHCOS extensions container by simplifying the repo configuration into a single file. As Fedora versions used by those containers reach EOL, we wont have to remove and replace the `fedora.repo` file. Instead, we can just use this file for container setup. --- fedora-archive.repo | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/fedora-archive.repo b/fedora-archive.repo index 291a5c44df..9a80c38321 100644 --- a/fedora-archive.repo +++ b/fedora-archive.repo @@ -4,10 +4,15 @@ # specified in a Firewall Egress file. By using these archive repos on # the older RHCOS branches, we can ensure that those kola tests will # always download archived content from `https://dl.fedoraproject.org`. +# We include both EOL and non-EOL repository locations in the baseurl list +# to simplify maintenance, avoiding the need to remove the fedora.repo file +# as versions reach EOL. [fedora-archive] name=Fedora $releasever - $basearch -baseurl=https://dl.fedoraproject.org/pub/archive/fedora/linux/releases/$releasever/Everything/$basearch/os/ +baseurl=https://dl.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/ + https://dl.fedoraproject.org/pub/fedora-secondary/releases/$releasever/Everything/$basearch/os/ + https://dl.fedoraproject.org/pub/archive/fedora/linux/releases/$releasever/Everything/$basearch/os/ https://dl.fedoraproject.org/pub/archive/fedora-secondary/releases/$releasever/Everything/$basearch/os/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch enabled=1 @@ -20,7 +25,9 @@ skip_if_unavailable=False [fedora-archive-updates] name=Fedora $releasever - $basearch -baseurl=https://dl.fedoraproject.org/pub/archive/fedora/linux/updates/$releasever/Everything/$basearch/ +baseurl=https://dl.fedoraproject.org/pub/fedora/linux/updates/$releasever/Everything/$basearch/ + https://dl.fedoraproject.org/pub/fedora-secondary/updates/$releasever/Everything/$basearch/ + https://dl.fedoraproject.org/pub/archive/fedora/linux/updates/$releasever/Everything/$basearch/ https://dl.fedoraproject.org/pub/archive/fedora-secondary/updates/$releasever/Everything/$basearch/ #metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch enabled=1