Tweak crb script. Fix for RHEL rhui repos (#2308671)

Signed-off-by: Troy Dawson <tdawson@redhat.com>

README-epel-8-packaging.md

@@ -28,74 +28,26 @@ branching to EPEL, other ones can step in and do so.
 
 ## EPEL Next
 
-EPEL packages are built against RHEL.  EPEL Next is an additional repository
-that allows package maintainers to alternatively build against CentOS Stream.
-This is sometimes necessary when CentOS Stream contains an upcoming RHEL
-library rebase, or if an EPEL package has a minimum version build requirement
-that is already in CentOS Stream but not yet in RHEL.  EPEL Next has its own
-distgit branches, koji build targets, and bodhi releases.
-
-EPEL Next packages have `.next` appended to the disttag (e.g. a disttag of
-`.el8.next` for epel8-next) to provide an upgrade path from an EPEL package
-that was built from the same distgit commit.  A package maintainer can rebuild
-the same commit for both EPEL and EPEL Next and get two different NVRs in koji.
-Within six months, the build requirement necessitating building in EPEL Next
-should be in RHEL, and at that time the package maintainer can do a normal
-release bump commit in the EPEL branch and get a newer NVR than both the
-previous EPEL and EPEL Next packages.
-
-To get started with EPEL Next, request the corresponding branch for the EPEL
-release you are targeting, e.g. request an epel8-next branch to rebuild an
-epel8 package against CentOS Stream 8.  Once the branch is created you can
-merge commits from other branches and submit a build just like you would for
-other EPEL or Fedora branches.
+EPEL 8 Next was shut down in June 2024, corresponding to the EOL of CentOS
+Stream 8.
 
-## EPEL Playground
-
-We have added an additional set of channels for EPEL-8 called
-playground. It is meant to be sort of like Fedora Rawhide so that
-packagers can work on versions of software which are too fast moving
-or will have large API changes from what they are putting in the
-regular channel.
-
-To try and make this transparent, we have made it so when a package is
-built in epel8 it will normally also be built in
-epel8-playground. This is done via a packages.cfg file which lists the
-targets for fedpkg to build against. A successful package build will
-then go through 2 different paths:
-
-* epel8 package will go into bodhi to be put into epel8-testing
-* epel8-playground will bypass bodhi and go directly into
-  epel8-playground the next compose.
+EPEL 8 Next was a place for maintainers to optionally build against CentOS
+Stream 8 instead of RHEL 8.  This was sometimes necessary when CentOS Stream 8
+contains an upcoming RHEL 8 library rebase, or if an EPEL 8 package has a
+minimum version build requirement that is already in CentOS Stream 8 but not
+yet in RHEL 8.
 
-If a packager needs to focus only on epel8 or epel8-playground they
-can edit packages.cfg to change the ```target= epel8
-epel8-playground``` to ```target= epel8 ```.
-
-Packages in epel8-playground are primarily to be used in the following
-manner:
-
-* To test out some new version of the package that might not be stable
-  yet.
-
-* To test out some new packaging of the package
+## EPEL Playground
 
-* To test a major version change of the package that they want to land
-  at the next epel8 minor release.
+EPEL Playground was shut down in January 2022
 
-* To build a package that will never be stable enough for epel8, but
-  still could be useful to some.
+EPEL 8 Playground was a place that developers and maintainers could 
+"play around" with updated, or changed packages in epel. EPEL Playground
+never really worked out and ended up being more burden than helpful.
 
-* At minor RHEL releases (ie, 8.1, 8.2) people can pull in big changes
-  from playground to the main epel8 packages. Since people will be
-  upgrading and paying more attention than usual anyhow at those
-  points, it’s a great chance to do that change, but also you want to
-  make sure it’s panned out, so you can test before hand in
-  playground.
+If developers or maintainers want something similar to EPEL Playground 
+we recommend Fedora COPR, which has availability for EPEL builds.
 
-Consumers should be aware that packages in EPEL8-playground are there
-without any Service Level Expectations. You may want to only cherry
-pick packages from there as needed.
 
 ## Developer request for branching multiple packages
 

crb

@@ -0,0 +1,85 @@
+#!/bin/bash
+#  Enable / Disable / Status the codeready-builder(CRB) or equivalent repo.
+
+###############
+# Show help
+###############
+usage() {
+  echo "Usage `basename $0` [ enable | disable | status ] " >&2
+  echo >&2
+  echo "Enable, Disable, or give the status of the CodeReady Builder (CRB) repo" >&2
+  echo >&2
+  echo "Options:" >&2
+  echo "  enable" >&2
+  echo "    Enable the CRB repo" >&2
+  echo "  disable" >&2
+  echo "    Disable the CRB repo" >&2
+  echo "  status" >&2
+  echo "    Show if rhe CRB repo is enabled or disabled" >&2
+  echo "  help" >&2
+  echo "    Show this options menu" >&2
+  echo >&2
+  popd &>/dev/null
+  exit 1
+}
+
+
+# Show the status
+show_status()(
+    # Determine if a version of CRB is enabled
+    crb_repo=$(dnf repolist | grep -i -e crb -e powertools -e codeready | grep -v -i -e debug -e source -e eus -e virt -e rhui | awk '{print $1}')
+    if [ "${crb_repo}" == "" ] ; then
+        echo "CRB repo is disabled"
+    else
+        echo "CRB repo is enabled and named: ${crb_repo}"
+    fi
+)
+
+# Enable or Disable the repo
+enable_disable_repo(){
+    command="$1"
+    # Determine which repo we need to change
+    crb_repo=$(dnf repolist --all | grep -i -e crb -e powertools -e codeready | grep -v -i -e debug -e source -e eus -e virt -e rhui | awk '{print $1}')
+
+    # Determine if we are on RHEL or not, then do the correct steps
+    source /etc/os-release
+    if [[ "${NAME}" =~ "Red Hat" ]] ; then
+        subscription-manager repos ${command} ${crb_repo}
+    else
+        # Determine if dnf-command(config-manager) is installed
+        if ! rpm -q --whatprovides 'dnf-command(config-manager)' > /dev/null 2>&1 ; then
+            echo "Error: Please run: dnf install 'dnf-command(config-manager)'" >&2
+            echo "       before trying to enable/disable the CRB repo." >&2
+            echo "Aborting"'!' >&2
+            exit 1
+        fi
+        # Everything else uses dnf config-manager
+        dnf config-manager ${command} ${crb_repo}
+    fi
+}
+
+###############
+# Get our arguments
+###############
+key="$1"
+case $key in
+enable | --enable )
+    echo "Enabling CRB repo"
+    enable_disable_repo --enable
+    show_status
+;;
+disable | --disable )
+    echo "Disabling CRB repo"
+    enable_disable_repo --disable
+    show_status
+;;
+status | --status )
+    show_status
+;;
+* )
+    usage
+    exit 2
+;;
+esac
+
+exit 0

epel-modular.repo

@@ -1,30 +1,33 @@
 [epel-modular]
-name=Extra Packages for Enterprise Linux Modular $releasever - $basearch
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - $basearch - RETIRED
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-$releasever&arch=$basearch&infra=$infra&content=$contentdir
-enabled=1
+#baseurl=https://download.example/pub/epel/8/Modular/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-8&arch=$basearch&infra=$infra&content=$contentdir
+enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 [epel-modular-debuginfo]
-name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Debug
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - $basearch - Debug - RETIRED
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=https://download.example/pub/epel/$releasever/Modular/$basearch/debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/8/Modular/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-debug-8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
 
 [epel-modular-source]
-name=Extra Packages for Enterprise Linux Modular $releasever - $basearch - Source
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - $basearch - Source - RETIRED
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place it's address here.
-#baseurl=https://download.example/pub/epel/$releasever/Modular/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/8/Modular/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-modular-source-8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1

epel-next-testing.repo

@@ -1,30 +0,0 @@
-[epel-next-testing]
-name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-$releasever&arch=$basearch&infra=$infra&content=$contentdir
-enabled=0
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
-
-[epel-next-testing-debuginfo]
-name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Debug
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
-gpgcheck=1
-
-[epel-next-testing-source]
-name=Extra Packages for Enterprise Linux $releasever - Next - Testing - $basearch - Source
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place it's address here.
-#baseurl=https://download.example/pub/epel/testing/next/$releasever/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-testing-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
-gpgcheck=1

epel-next.repo

@@ -1,30 +0,0 @@
-[epel-next]
-name=Extra Packages for Enterprise Linux $releasever - Next - $basearch
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/next/$releasever/Everything/$basearch/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-$releasever&arch=$basearch&infra=$infra&content=$contentdir
-enabled=1
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
-
-[epel-next-debuginfo]
-name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Debug
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/next/$releasever/Everything/$basearch/debug/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
-gpgcheck=1
-
-[epel-next-source]
-name=Extra Packages for Enterprise Linux $releasever - Next - $basearch - Source
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place it's address here.
-#baseurl=https://download.example/pub/epel/next/$releasever/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-next-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
-gpgcheck=1

epel-playground.repo

@@ -1,30 +0,0 @@
-[epel-playground]
-name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/os
-metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
-enabled=0
-gpgcheck=1
-countme=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
-
-[epel-playground-debuginfo]
-name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Debug
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/$basearch/debug/tree
-metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
-gpgcheck=1
-
-[epel-playground-source]
-name=Extra Packages for Enterprise Linux $releasever - Playground - $basearch - Source
-# It is much more secure to use the metalink, but if you wish to use a local mirror
-# place its address here.
-#baseurl=https://download.example/pub/epel/playground/$releasever/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=playground-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
-gpgcheck=1

epel-release.spec

@@ -1,6 +1,6 @@
 Name:           epel-release
 Version:        8
-Release:        13%{dist}
+Release:        21%{dist}
 Summary:        Extra Packages for Enterprise Linux repository configuration
 
 License:        GPLv2
@@ -18,17 +18,23 @@ Source3:        90-epel.preset
 
 Source100:      epel.repo
 Source101:      epel-testing.repo
-Source102:      epel-next.repo
-Source103:      epel-next-testing.repo
-Source104:      epel-playground.repo
 Source105:      epel-modular.repo
 Source106:      epel-testing-modular.repo
 
+# Add epel crb repo
+Source301:      crb
+
 BuildArch:     noarch
 Requires:      redhat-release >=  %{version}
 # epel-release is only for enterprise linux, not fedora
 Conflicts:     fedora-release
-Recommends:    (epel-next-release if centos-stream-release)
+# crb needs config-manager to run
+# But only recommend it, incase people do not need crb
+Recommends:    dnf-command(config-manager)
+# EPEL 8 Next is EOL, but EPEL 8 continues.  Obsolete the epel-next-release
+# package to remove the EPEL 8 Next repos for any EL8 systems that still have
+# it installed.
+Obsoletes:      epel-next-release < 8-20
 
 
 %description
@@ -36,16 +42,6 @@ This package contains the Extra Packages for Enterprise Linux (EPEL) repository
 GPG key as well as configuration for yum.
 
 
-%package -n epel-next-release
-Summary:        Extra Packages for Enterprise Linux Next repository configuration
-Requires:       %{name} = %{version}-%{release}
-
-
-%description -n epel-next-release
-This package contains the Extra Packages for Enterprise Linux (EPEL) Next
-configuration for yum.
-
-
 %prep
 %setup -q  -c -T
 install -pm 644 %{SOURCE1} .
@@ -59,10 +55,21 @@ install -Dpm 644 %{SOURCE0} \
 
 # yum
 install -dm 755 %{buildroot}%{_sysconfdir}/yum.repos.d
-install -pm 644 %{SOURCE100} %{SOURCE101} %{SOURCE102} %{SOURCE103} %{SOURCE104} %{SOURCE105} %{SOURCE106} \
+install -pm 644 %{SOURCE100} %{SOURCE101} %{SOURCE105} %{SOURCE106} \
     %{buildroot}%{_sysconfdir}/yum.repos.d
 install -pm 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/90-epel.preset
 
+# Add epel crb repo
+install -D -pm744 -t %{buildroot}%{_bindir} %{SOURCE301}
+
+%post
+# Doing a check to see if crb is enabled is as hard and resource intense as enabling or disabling crb.
+#   So we will say crb is recommended, without first checking.  But only on the initial install.
+if [ "$1" -eq 1 ] ; then
+  echo "Many EPEL packages require the CodeReady Builder (CRB) repository."
+  echo "It is recommended that you run %{_bindir}/crb enable to enable the CRB repository."
+fi
+
 
 %files
 %doc README-epel-8-packaging.md
@@ -71,17 +78,38 @@ install -pm 644 -D %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/9
 %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-modular.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/epel-testing-modular.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-playground.repo
 %{_sysconfdir}/pki/rpm-gpg/*
 %{_prefix}/lib/systemd/system-preset/90-epel.preset
+%{_bindir}/crb
 
 
-%files -n epel-next-release
-%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/epel-next-testing.repo
+%changelog
+* Fri Aug 30 2024 Troy Dawson <tdawson@redhat.com> - 8-21
+- Tweak crb script. Fix for RHEL rhui repos (#2308671)
 
+* Thu Jun 27 2024 Carl George <carlwgeorge@fedoraproject.org> - 8-20
+- Obsolete epel-next-release subpackage for EPEL 8 Next retirement
+
+* Mon Apr 17 2023 Troy Dawson <tdawson@redhat.com> - 8-19
+- Tweak crb script, check os-release for RHEL (#2186721)
+
+* Thu Sep 29 2022 Carl George <carl@george.computer> - 8-18
+- Disable epel-modular repo by default
+- Mark all epel-modular repos as deprecated
+
+* Tue Aug 09 2022 Troy Dawson <tdawson@redhat.com> - 8-17
+- Tweak crb script, Recommends dnf-command(config-manager) (#2115602)
+
+* Thu Jun 30 2022 Troy Dawson <tdawson@redhat.com> - 8-16
+- Add crb script
+
+* Mon Mar 14 2022 Troy Dawson <tdawson@redhat.com> - 8-15
+- Remove the use of $releasever ( rhbz#1969500 )
+
+* Fri Jan 28 2022 Troy Dawson <tdawson@redhat.com> - 8-14
+- Remove epel8-playground repo
+- Update playground section in README-epel-8-packaging.md
 
-%changelog
 * Fri Sep 03 2021 Mohan Boddu <mboddu@bhujji.com> - 8-13
 - Change the baseurl to point to source/tree for srpms
 

epel-testing-modular.repo

@@ -1,30 +1,33 @@
 [epel-testing-modular]
-name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - RETIRED
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/$basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/testing/8/Modular/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 [epel-testing-modular-debuginfo]
-name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Debug
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - Debug - RETIRED
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/$basearch/debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/testing/8/Modular/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-debug-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
 
 [epel-testing-modular-source]
-name=Extra Packages for Enterprise Linux Modular $releasever - Testing - $basearch - Source
+# This repo has been RETIRED, see https://pagure.io/epel/issue/198 for more details.
+name=Extra Packages for Enterprise Linux Modular 8 - Testing - $basearch - Source - RETIRED
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place it's address here.
-#baseurl=https://download.example/pub/epel/testing/$releasever/Modular/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/testing/8/Modular/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-modular-source-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1

epel-testing.repo

@@ -1,30 +1,30 @@
 [epel-testing]
-name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch
+name=Extra Packages for Enterprise Linux 8 - Testing - $basearch
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/testing/8/Everything/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 [epel-testing-debuginfo]
-name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Debug
+name=Extra Packages for Enterprise Linux 8 - Testing - $basearch - Debug
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/$basearch/debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/testing/8/Everything/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-debug-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
 
 [epel-testing-source]
-name=Extra Packages for Enterprise Linux $releasever - Testing - $basearch - Source
+name=Extra Packages for Enterprise Linux 8 - Testing - $basearch - Source
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place it's address here.
-#baseurl=https://download.example/pub/epel/testing/$releasever/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/testing/8/Everything/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=testing-source-epel8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1

epel.repo

@@ -1,30 +1,30 @@
 [epel]
-name=Extra Packages for Enterprise Linux $releasever - $basearch
+name=Extra Packages for Enterprise Linux 8 - $basearch
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/8/Everything/$basearch
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=1
 gpgcheck=1
 countme=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 
 [epel-debuginfo]
-name=Extra Packages for Enterprise Linux $releasever - $basearch - Debug
+name=Extra Packages for Enterprise Linux 8 - $basearch - Debug
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place its address here.
-#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/debug
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/8/Everything/$basearch/debug
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-debug-8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1
 
 [epel-source]
-name=Extra Packages for Enterprise Linux $releasever - $basearch - Source
+name=Extra Packages for Enterprise Linux 8 - $basearch - Source
 # It is much more secure to use the metalink, but if you wish to use a local mirror
 # place it's address here.
-#baseurl=https://download.example/pub/epel/$releasever/Everything/source/tree/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-$releasever&arch=$basearch&infra=$infra&content=$contentdir
+#baseurl=https://download.example/pub/epel/8/Everything/source/tree/
+metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-source-8&arch=$basearch&infra=$infra&content=$contentdir
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-8
 gpgcheck=1