Merge pull request #135 from matyasselmeci/pr/osg-25

Build for OSG 25 (SOFTWARE-6297)

Author: matyasselmeci

.github/workflows/release-series-images.yml

@@ -29,23 +29,16 @@ 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'
+          - name: '25'
+            os: 'el9'
+            project: 'osg-htc'
     steps:
 
     - 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 +69,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 +83,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:

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 <help@osg-htc.org>"
 
 # 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 && \

hosted-ce/Dockerfile

@@ -7,34 +7,26 @@ LABEL maintainer "OSG Software <help@osg-htc.org>"
 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 && \
     rm -rf /var/cache/yum/
 
 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
 
 # SOFTWARE-5613: override package versions of remote WN client scripts
 # 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 && \