HTCONDOR-2030: crb needed to build on EL9

htcondor · Sep 12, 2023 · fb53a24 · fb53a24
1 parent 179291d
commit fb53a24
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/tests/build_rpms.sh b/tests/build_rpms.sh
@@ -35,8 +35,10 @@ yum install -y epel-release $YUM_PKG_NAME
 # Broken mirror?
 echo "exclude=mirror.beyondhosting.net" >> /etc/yum/pluginconf.d/fastestmirror.conf
 
-if [[ $OS_VERSION != 7 ]]; then
-    yum-config-manager --enable powertools
+if [ $OS_VERSION -eq 8 ]; then
+    dnf config-manager --enable powertools
+elif [ $OS_VERSION -eq 9 ]; then
+    dnf config-manager --enable crb
 fi
 
 # Install packages required for the build

diff --git a/tests/containers/entrypoint/Dockerfile b/tests/containers/entrypoint/Dockerfile
@@ -28,8 +28,10 @@ RUN \
     yum update -y && \
     yum install -y https://research.cs.wisc.edu/htcondor/repo/${CONDOR_SERIES}/htcondor-release-current.el${EL}.noarch.rpm \
                    $YUM_PKG_NAME && \
-    if [[ $OS_VERSION != 7 ]]; then \
-       yum-config-manager --enable powertools; \
+    if [ $OS_VERSION -eq 8 ]; then \
+       dnf config-manager --enable powertools; \
+    elif [ $OS_VERSION -eq 9 ]; then \
+       dnf config-manager --enable crb; \
     fi && \
     yum install -y git \
                    make \