Skip to content

Commit bbb6c24

Browse files
committed
HTCONDOR-2688: Update to HTCondor 24.x and Almalinux 9
1 parent 825aa6b commit bbb6c24

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Diff for: tests/build_rpms.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ if [[ $BUILD_ENV == osg* ]]; then
6565
OSG_SERIES="${OSG_SERIES}-main"
6666
yum install -y https://repo.opensciencegrid.org/osg/${OSG_SERIES}/osg-${OSG_SERIES}-el${OS_VERSION}-release-latest.rpm
6767
else
68-
# This is currently tracking the 10.x feature release.
68+
# This is currently tracking the 24.x feature release.
6969
# For the stable release series the version number is required.
7070
# For the feature series, one can either use the version number (i.e. 9.1)
7171
# or 'current' which tracks the latest feature series
72-
yum install -y https://research.cs.wisc.edu/htcondor/repo/10.x/htcondor-release-current.el${OS_VERSION}.noarch.rpm
72+
yum install -y https://research.cs.wisc.edu/htcondor/repo/24.x/htcondor-release-current.el${OS_VERSION}.noarch.rpm
7373
fi
7474

7575
# Prepare the RPM environment

Diff for: tests/containers/README.dev.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ docker build -t entrypoint -f tests/containers/entrypoint/Dockerfile .
2222

2323
You may also specify `--build-arg` for:
2424

25-
- `BASE_IMAGE`: EL-based OS container base image (default: `rockylinux:8`, suggested alternative `centos:7`)
26-
- `CONDOR_SERIES`: HTCondor release series (default `10.x`)
25+
- `BASE_IMAGE`: EL-based OS container base image (default: `almalinux:9`, suggested alternative `rockylinux:8`)
26+
- `CONDOR_SERIES`: HTCondor release series (default `24.x`)
2727

2828
### Starting the CE ###
2929

Diff for: tests/containers/entrypoint/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ ARG BASE_IMAGE=rockylinux:8
33
FROM $BASE_IMAGE
44

55
# "ARG BASE_IMAGE" needs to be here again because the previous instance has gone out of scope.
6-
ARG BASE_IMAGE=rockylinux:8
7-
ARG CONDOR_SERIES=10.x
6+
ARG BASE_IMAGE=almalinux:9
7+
ARG CONDOR_SERIES=24.x
88

99
RUN groupadd -o -g 9619 testuser && \
1010
useradd -m -u 9619 -g 9619 -s /bin/bash testuser

0 commit comments

Comments
 (0)