From cd70325f14889512f70577111a10f4e1ebd73549 Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Tue, 12 Sep 2023 12:41:43 -0500 Subject: [PATCH 1/6] HTCONDOR-2030: Fix tests --- tests/build_rpms.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/build_rpms.sh b/tests/build_rpms.sh index cc7d689c4..bd756ec7e 100755 --- a/tests/build_rpms.sh +++ b/tests/build_rpms.sh @@ -78,6 +78,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 From ed97bff73ab30ef020ae9a0265eceaadc92045d1 Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Tue, 12 Sep 2023 12:50:47 -0500 Subject: [PATCH 2/6] HTCONDOR-2030: Test against HTCondor 10.0 --- tests/build_rpms.sh | 4 ++-- tests/containers/README.dev.md | 2 +- tests/containers/entrypoint/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/build_rpms.sh b/tests/build_rpms.sh index bd756ec7e..e7a01f348 100755 --- a/tests/build_rpms.sh +++ b/tests/build_rpms.sh @@ -62,11 +62,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.0 stable 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.0/htcondor-release-current.el${OS_VERSION}.noarch.rpm fi # Prepare the RPM environment diff --git a/tests/containers/README.dev.md b/tests/containers/README.dev.md index 682573f46..b3641b89c 100644 --- a/tests/containers/README.dev.md +++ b/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.0`) ### Starting the CE ### diff --git a/tests/containers/entrypoint/Dockerfile b/tests/containers/entrypoint/Dockerfile index 2cb8a92be..521fd79fd 100644 --- a/tests/containers/entrypoint/Dockerfile +++ b/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.0 RUN groupadd -o -g 9619 testuser && \ useradd -m -u 9619 -g 9619 -s /bin/bash testuser From f5ad72236e11e93066f5d32913097f748521f889 Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Tue, 12 Sep 2023 12:56:15 -0500 Subject: [PATCH 3/6] HTCONDOR-2030: Suppress warnings about deprecated /var/run --- config/condor-ce-collector.conf | 2 +- config/condor-ce.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/condor-ce-collector.conf b/config/condor-ce-collector.conf index 7402e4b01..3f0e72470 100644 --- a/config/condor-ce-collector.conf +++ b/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 - - diff --git a/config/condor-ce.conf b/config/condor-ce.conf index 7402e4b01..3f0e72470 100644 --- a/config/condor-ce.conf +++ b/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 - - From 179291dd40eecdc69c83dccd94ec57df90710869 Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Tue, 12 Sep 2023 13:00:04 -0500 Subject: [PATCH 4/6] HTCONDOR-2030: Add almalinux 9 to test matrix --- .github/workflows/build_and_test_rpms.yml | 1 + .github/workflows/upload_rpms.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build_and_test_rpms.yml b/.github/workflows/build_and_test_rpms.yml index 6cd842d3e..954ef2c31 100644 --- a/.github/workflows/build_and_test_rpms.yml +++ b/.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 diff --git a/.github/workflows/upload_rpms.yaml b/.github/workflows/upload_rpms.yaml index 392f3b075..1dc328d60 100644 --- a/.github/workflows/upload_rpms.yaml +++ b/.github/workflows/upload_rpms.yaml @@ -14,6 +14,7 @@ jobs: platform: - centos:7 - rockylinux:8 + - almalinux:9 steps: - uses: actions/checkout@v3 From fb53a243594c7511147adf5996f36ae5a21c12f4 Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Tue, 12 Sep 2023 13:06:10 -0500 Subject: [PATCH 5/6] 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 \ From b68bb528a3fcfebd98446da76cf1865422e36782 Mon Sep 17 00:00:00 2001 From: Tim Theisen Date: Tue, 12 Sep 2023 13:09:38 -0500 Subject: [PATCH 6/6] HTCONDOR-2030: HTCondor 10.x needed to work with EL9 --- tests/build_rpms.sh | 4 ++-- tests/containers/README.dev.md | 2 +- tests/containers/entrypoint/Dockerfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/build_rpms.sh b/tests/build_rpms.sh index dd7f018cf..d23e052a7 100755 --- a/tests/build_rpms.sh +++ b/tests/build_rpms.sh @@ -64,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 10.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/10.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 diff --git a/tests/containers/README.dev.md b/tests/containers/README.dev.md index b3641b89c..d9068cedd 100644 --- a/tests/containers/README.dev.md +++ b/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 `10.0`) +- `CONDOR_SERIES`: HTCondor release series (default `10.x`) ### Starting the CE ### diff --git a/tests/containers/entrypoint/Dockerfile b/tests/containers/entrypoint/Dockerfile index 9649391f7..8fa656e28 100644 --- a/tests/containers/entrypoint/Dockerfile +++ b/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=10.0 +ARG CONDOR_SERIES=10.x RUN groupadd -o -g 9619 testuser && \ useradd -m -u 9619 -g 9619 -s /bin/bash testuser