HTCONDOR-3268: Update to HTCondor 25.x

timtheisen · timtheisen · commit 2bcd21162e8e · 2025-10-23T15:14:28.000-05:00
diff --git a/tests/build_rpms.sh b/tests/build_rpms.sh
@@ -65,11 +65,11 @@ if [[ $BUILD_ENV == osg* ]]; then
     OSG_SERIES="${OSG_SERIES}-main"
     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 24.x feature release.
+    # This is currently tracking the 25.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/24.x/htcondor-release-current.el${OS_VERSION}.noarch.rpm
+    yum install -y https://research.cs.wisc.edu/htcondor/repo/25.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
@@ -22,8 +22,8 @@ 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: `almalinux:9`, suggested alternative `rockylinux:8`)
-- `CONDOR_SERIES`: HTCondor release series (default `24.x`)
+- `BASE_IMAGE`: EL-based OS container base image (default: `almalinux:9`, suggested alternative `rockylinux:9`)
+- `CONDOR_SERIES`: HTCondor release series (default `25.x`)
 
 ### Starting the CE ###
 
diff --git 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=almalinux:9
-ARG CONDOR_SERIES=24.x
+ARG CONDOR_SERIES=25.x
 
 RUN groupadd -o -g 9619 testuser && \
     useradd -m -u 9619 -g 9619 -s /bin/bash testuser
