Simplify configuration of EPEL / CRB

PowerTools was the pre-RHEL 9 repo name

diff --git a/.github/workflows/ci-rpm.yml b/.github/workflows/ci-rpm.yml
index 5413e8f44d39d73adf41f761125aec911433a3f9..e713b49c725b976742b21febc3b0b85d354d752f 100644 (file)
--- a/.github/workflows/ci-rpm.yml
+++ b/.github/workflows/ci-rpm.yml
@@ -72,16 +72,10 @@ jobs:
     name: "RPM build"
 
     steps:
-    - name: Enable PowerTools / CRB
+    - name: Enable EPEL and CRB
       run: |
-        dnf install -y dnf-utils dnf-plugins-core
-        dnf config-manager --enable PowerTools || :
-        dnf config-manager --enable powertools || :
-        dnf config-manager --enable crb || :
-
-    - name: Enable EPEL for Rocky Linux
-      run: |
-        dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${{ matrix.env.VERSION }}.noarch.rpm
+        dnf install -y dnf-utils dnf-plugins-core epel-release
+        dnf config-manager --enable crb
 
     # For pkill
     - name: Enable procps-ng
@@ -200,16 +194,10 @@ jobs:
         echo 'gpgkey=https://packages.networkradius.com/pgp/packages@networkradius.com'             >> /etc/yum.repos.d/networkradius-extras.repo
         rpm --import https://packages.networkradius.com/pgp/packages@networkradius.com
 
-    - name: Enable PowerTools / CRB
-      run: |
-        dnf install -y dnf-utils dnf-plugins-core
-        dnf config-manager --enable PowerTools || :
-        dnf config-manager --enable powertools || :
-        dnf config-manager --enable crb || :
-
-    - name: Enable EPEL for Rocky Linux
+    - name: Enable EPEL and CRB
       run: |
-        dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${{ matrix.env.VERSION }}.noarch.rpm
+        dnf install -y dnf-utils dnf-plugins-core epel-release
+        dnf config-manager --enable crb
 
     # For pkill
     - name: Enable procps-ng