From 1f9c63b5d12d9f19a66bdee5f059c5347f64883c Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 17 Feb 2026 15:02:09 -0600 Subject: [PATCH 1/3] Stop building OSG 23 images Since OSG 24+ images are not pushed to Docker Hub, also remove code for pushing to Docker Hub. --- .github/workflows/release-series-images.yml | 22 ++++----------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release-series-images.yml b/.github/workflows/release-series-images.yml index 2e54dd2..d8069fe 100644 --- a/.github/workflows/release-series-images.yml +++ b/.github/workflows/release-series-images.yml @@ -29,9 +29,6 @@ jobs: repo: ['development', 'testing', 'release'] image: ['hosted-ce', 'osg-ce-condor'] osg_series: - - name: '23' - os: 'el9' - project: 'opensciencegrid' - name: '24' os: 'el9' project: 'osg-htc' @@ -39,13 +36,6 @@ jobs: - uses: actions/checkout@v3 - - name: Log in to Docker Hub - uses: docker/login-action@v2.2.0 - if: github.event_name != 'pull_request' && startsWith(github.repository, 'opensciencegrid/') - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - name: Log in to OSG Harbor uses: docker/login-action@v2.2.0 if: github.event_name != 'pull_request' && startsWith(github.repository, 'opensciencegrid/') @@ -76,13 +66,9 @@ jobs: run: | docker_repo=$PROJECT/$IMAGE tag_list=() - for registry in hub.opensciencegrid.org docker.io; do - if [[ $registry == 'docker.io' && $PROJECT == 'osg-htc' ]]; then - continue - fi - for image_tag in "$OSG_SERIES-$REPO" "$OSG_SERIES-$REPO-$TIMESTAMP"; do - tag_list+=("$registry/$docker_repo":"$image_tag") - done + registry=hub.opensciencegrid.org + for image_tag in "$OSG_SERIES-$REPO" "$OSG_SERIES-$REPO-$TIMESTAMP"; do + tag_list+=("$registry/$docker_repo":"$image_tag") done # This causes the tag_list array to be comma-separated below, # which is required for build-push-action @@ -94,7 +80,7 @@ jobs: with: driver: docker # If not set to docker driver, it will default to docker-container # when using load for the build-push-action. - + - name: Build and push hosted-ce and osg-ce-condor images uses: docker/build-push-action@v4 with: From f922a5057b784f4f23d08fb1e97c86e4837c4652 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 17 Feb 2026 14:53:18 -0600 Subject: [PATCH 2/3] Update Dockerfile defaults to build with OSG 25 and remove OSG 23-specific lines --- base/Dockerfile | 8 ++++---- hosted-ce/Dockerfile | 14 +++----------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 258003a..297da94 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -5,15 +5,15 @@ # Specify the opensciencegrid/software-base image tag ARG BASE_OS=el9 ARG BASE_YUM_REPO=release -ARG BASE_OSG_SERIES=24 +ARG BASE_OSG_SERIES=25 FROM opensciencegrid/software-base:$BASE_OSG_SERIES-$BASE_OS-$BASE_YUM_REPO LABEL maintainer "OSG Software " # previous args have gone out of scope -ARG BASE_OS=el9 -ARG BASE_YUM_REPO=release -ARG BASE_OSG_SERIES=23 +ARG BASE_OS +ARG BASE_YUM_REPO +ARG BASE_OSG_SERIES # Ensure that the 'condor' UID/GID matches across containers RUN groupadd -g 64 -r condor && \ diff --git a/hosted-ce/Dockerfile b/hosted-ce/Dockerfile index 4f20b15..a31dc50 100644 --- a/hosted-ce/Dockerfile +++ b/hosted-ce/Dockerfile @@ -7,15 +7,11 @@ LABEL maintainer "OSG Software " LABEL name "hosted-ce" ARG BASE_YUM_REPO=release -ARG BASE_OSG_SERIES=24 +ARG BASE_OSG_SERIES=25 RUN if [[ $BASE_YUM_REPO == 'release' ]]; then \ - if [[ $BASE_OSG_SERIES == '23' ]]; then \ - yum install -y --enablerepo=osg-upcoming-testing osg-ce-bosco htcondor-ce-view 'perl(filetest)'; \ - else \ - yum install -y --enablerepo=osg-testing osg-ce-bosco htcondor-ce-view 'perl(filetest)'; \ - fi \ + yum install -y --enablerepo=osg-testing osg-ce-bosco htcondor-ce-view 'perl(filetest)'; \ else \ yum install -y osg-ce-bosco htcondor-ce-view 'perl(filetest)'; \ fi && \ @@ -23,7 +19,7 @@ RUN if [[ $BASE_YUM_REPO == 'release' ]]; then \ COPY etc/osg/image-config.d/ /etc/osg/image-config.d/ -# Use "ssh -q" in bosco_cluster until the chang has been upstreamed to condor +# Use "ssh -q" in bosco_cluster until the change has been upstreamed to condor # Enable bosco_cluster xtrace COPY tmp/ /tmp @@ -31,10 +27,6 @@ COPY tmp/ /tmp # to allow for a faster dev -> ops turnaround COPY usr/bin/ /usr/bin -# HTCONDOR-2322: Override CE defaults script to fix Environment setting bug. -# Remove this once HTCondor-CE 23.0.8 is deployed for all hosted-ces. -COPY usr/share/condor-ce/ /usr/share/condor-ce - # Handle bosco_cluster -> condor_remote_cluster symlink RUN sed -i 's/bosco_cluster/condor_remote_cluster/g' /tmp/*.patch && \ patch -d / -p0 < /tmp/ssh_q.patch && \ From 38168bf79093747a73dc5544c62b1e98cf435224 Mon Sep 17 00:00:00 2001 From: Matyas Selmeci Date: Tue, 17 Feb 2026 14:58:22 -0600 Subject: [PATCH 3/3] Update GitHub Actions to build for OSG 25 --- .github/workflows/release-series-images.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-series-images.yml b/.github/workflows/release-series-images.yml index d8069fe..8cc6a85 100644 --- a/.github/workflows/release-series-images.yml +++ b/.github/workflows/release-series-images.yml @@ -32,6 +32,9 @@ jobs: - name: '24' os: 'el9' project: 'osg-htc' + - name: '25' + os: 'el9' + project: 'osg-htc' steps: - uses: actions/checkout@v3