Merge pull request #583 from htcondor/V6-HTCONDOR-2030-fix-tests

HTCONDOR-2030: Fix tests

.github/workflows/build_and_test_rpms.yml

@@ -10,6 +10,7 @@ jobs:
         platform:
           - centos:7
           - rockylinux:8
+          - almalinux:9
         target_env:
           - uw_build
           - osg-3.6

.github/workflows/upload_rpms.yaml

@@ -14,6 +14,7 @@ jobs:
         platform:
           - centos:7
           - rockylinux:8
+          - almalinux:9
     steps:
       - uses: actions/checkout@v3
 

config/condor-ce-collector.conf

@@ -1,3 +1,3 @@
-d       /var/run/condor-ce              0755    condor  condor  -       -
+d       /run/condor-ce                  0755    condor  condor  -       -
 d       /var/lock/condor-ce             0755    condor  condor  -       -
 d       /var/lock/condor-ce/user        1777    condor  condor  -       -

config/condor-ce.conf

@@ -1,3 +1,3 @@
-d       /var/run/condor-ce              0755    condor  condor  -       -
+d       /run/condor-ce                  0755    condor  condor  -       -
 d       /var/lock/condor-ce             0755    condor  condor  -       -
 d       /var/lock/condor-ce/user        1777    condor  condor  -       -

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
@@ -62,11 +64,11 @@ if [[ $BUILD_ENV == osg* ]]; then
     OSG_SERIES=$(cut -d- -f2 <<< "$BUILD_ENV")
     yum install -y https://repo.opensciencegrid.org/osg/${OSG_SERIES}/osg-${OSG_SERIES}-el${OS_VERSION}-release-latest.rpm
 else
-    # This is currently tracking the 9.0 stable release.
+    # This is currently tracking the 10.x feature release.
     # For the stable release series the version number is required.
     # For the feature series, one can either use the version number (i.e. 9.1)
     # or 'current' which tracks the latest feature series
-    yum install -y https://research.cs.wisc.edu/htcondor/repo/9.0/htcondor-release-current.el${OS_VERSION}.noarch.rpm
+    yum install -y https://research.cs.wisc.edu/htcondor/repo/10.x/htcondor-release-current.el${OS_VERSION}.noarch.rpm
 fi
 
 # Prepare the RPM environment
@@ -78,6 +80,7 @@ printf "%s\n" "%dist .el${OS_VERSION}" >> /etc/rpm/macros.dist
 cp htcondor-ce/rpm/htcondor-ce.spec /tmp/rpmbuild/SPECS
 package_version=`grep Version htcondor-ce/rpm/htcondor-ce.spec | awk '{print $2}'`
 pushd htcondor-ce
+git config --global --add safe.directory /htcondor-ce
 git archive --format=tar --prefix=htcondor-ce-${package_version}/ HEAD | \
     gzip > /tmp/rpmbuild/SOURCES/htcondor-ce-${package_version}.tar.gz
 popd

tests/containers/README.dev.md

@@ -23,7 +23,7 @@ docker build -t entrypoint -f tests/containers/entrypoint/Dockerfile .
 You may also specify `--build-arg` for:
 
 - `BASE_IMAGE`: EL-based OS container base image (default: `rockylinux:8`, suggested alternative `centos:7`)
-- `CONDOR_SERIES`: HTCondor release series (default `9.0`)
+- `CONDOR_SERIES`: HTCondor release series (default `10.x`)
 
 ### Starting the CE ###
 

tests/containers/entrypoint/Dockerfile

@@ -4,7 +4,7 @@ FROM $BASE_IMAGE
 
 # "ARG BASE_IMAGE" needs to be here again because the previous instance has gone out of scope.
 ARG BASE_IMAGE=rockylinux:8
-ARG CONDOR_SERIES=9.0
+ARG CONDOR_SERIES=10.x
 
 RUN groupadd -o -g 9619 testuser && \
     useradd -m -u 9619 -g 9619 -s /bin/bash testuser
@@ -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 \