Skip to content

Commit

Permalink
HTCONDOR-2030: Test against HTCondor 10.0
Browse files Browse the repository at this point in the history
  • Loading branch information
timtheisen committed Sep 12, 2023
1 parent cd70325 commit ed97bff
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tests/build_rpms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/containers/README.dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###

Expand Down
2 changes: 1 addition & 1 deletion tests/containers/entrypoint/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ed97bff

Please sign in to comment.