From fb53a243594c7511147adf5996f36ae5a21c12f4 Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Tue, 12 Sep 2023 13:06:10 -0500 Subject: [PATCH] HTCONDOR-2030: crb needed to build on EL9 --- tests/build_rpms.sh | 6 ++++-- tests/containers/entrypoint/Dockerfile | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/build_rpms.sh b/tests/build_rpms.sh index e7a01f348..dd7f018cf 100755 --- 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 index 521fd79fd..9649391f7 100644 --- 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 \