Merge pull request #206 from mwestphall/SOFTWARE-6215-el10

SOFTWARE-6215: OSG 25

Author: brianhlin

.github/workflows/build-container.yml

@@ -18,27 +18,26 @@ jobs:
       fail-fast: false
       matrix:
         os: ['el9', 'cuda_11_8_0']
-        # osg_series: ['23']
         repo: ['development', 'testing', 'release']
-        osg_series:
-          - series: '24'
-            image: 'osg-htc/ospool-ep'
-          - series: '23'
-            image: 'opensciencegrid/osgvo-docker-pilot'
+        image: ['osg-htc/ospool-ep']
+        osg_series: ['24', '25']
         arch: ['amd64','arm64']
         exclude:
           # cuda builds take a super long time; only do one of them
           - os: cuda_11_8_0
             repo: development
           - os: cuda_11_8_0
             repo: testing
+          # EL10 isn't supported in OSG 24
+          - os: el10
+            osg_series: '24'
     steps:
       - uses: actions/checkout@v3
 
       - id: custom-image-name
         env:
-          SERIES: ${{ matrix.osg_series.series }}
-          IMAGE: ${{ matrix.osg_series.image }}
+          SERIES: ${{ matrix.osg_series }}
+          IMAGE: ${{ matrix.image }}
           REPO: ${{ matrix.repo }}
           OS: ${{ matrix.os }}
         run: |
@@ -53,7 +52,7 @@ jobs:
         uses: opensciencegrid/build-container-action@HEAD
         with:
           registry_url: hub.opensciencegrid.org
-          osg_series: ${{ matrix.osg_series.series }}
+          osg_series: ${{ matrix.osg_series }}
           osg_repo: ${{ matrix.repo }}
           base_os: ${{ matrix.os }}
           platform: linux/${{ matrix.arch }}
@@ -114,40 +113,13 @@ jobs:
           registry: hub.opensciencegrid.org
           username: ${{ secrets.OSG_HARBOR_ROBOT_USER }}
           password: ${{ secrets.OSG_HARBOR_ROBOT_PASSWORD }}
-          osg_series: ${{ matrix.osg_series.series }}
+          osg_series: ${{ matrix.osg_series }}
           osg_repo: ${{ matrix.repo }}
           base_os: ${{ matrix.os }}
           platform: linux/${{ matrix.arch }}
           base_tag: ${{ steps.custom-image-name.outputs.base_tag }}
           timestamp: ${{ steps.custom-image-name.outputs.timestamp }}
           output_image: ${{ steps.custom-image-name.outputs.output_image }}
-
-      # TODO: these artifacts will only be tagged if the build succeeds for every arch,
-      # and will remain as cruft in harbor unlesss manually removed in the case that
-      # some arch fails. Handling this scenario is future work: 
-      # https://opensciencegrid.atlassian.net/browse/SOFTWARE-6010
-      - id: upload-by-digest-dockerhub
-        # TODO support the osg-htc organization on dockerhub 
-        if: >-
-          github.ref == 'refs/heads/master' &&
-          github.event_name != 'pull_request' &&
-          contains(fromJson('["opensciencegrid","osg-htc"]'), github.repository_owner) &&
-          startsWith(matrix.osg_series.image, 'opensciencegrid')
-
-        name: Upload By Digest to Docker Hub
-        uses: ./.github/actions/push-digest-local
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          osg_series: ${{ matrix.osg_series.series }}
-          osg_repo: ${{ matrix.repo }}
-          base_os: ${{ matrix.os }}
-          platform: linux/${{ matrix.arch }}
-          base_tag: ${{ steps.custom-image-name.outputs.base_tag }}
-          timestamp: ${{ steps.custom-image-name.outputs.timestamp }}
-          output_image: ${{ steps.custom-image-name.outputs.output_image }}
-
   merge-manifests:
     runs-on: ubuntu-22.04
     if: >-
@@ -159,19 +131,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['el9', 'cuda_11_8_0']
+        os: ['el9', 'el10', 'cuda_11_8_0']
         repo: ['development', 'testing', 'release']
-        osg_series: ['23', '24']
+        osg_series: ['24', '25']
         registry: [
           {
             url: hub.opensciencegrid.org,
             username: OSG_HARBOR_ROBOT_USER,
             password: OSG_HARBOR_ROBOT_PASSWORD
-          },
-          {
-            url: docker.io,
-            username: DOCKER_USERNAME,
-            password: DOCKER_PASSWORD
           }
         ]
         exclude:
@@ -180,11 +147,8 @@ jobs:
             repo: development
           - os: cuda_11_8_0
             repo: testing
-          - osg_series: '24'
-            registry:
-              url: docker.io
-              username: DOCKER_USERNAME
-              password: DOCKER_PASSWORD
+          - os: el10
+            osg_series: '24'
     steps:
     - id: base-tag
       env:
@@ -243,7 +207,7 @@ jobs:
           docker buildx imagetools create --tag $tag $DIGESTS;
 
           # Also tag the image for the default OS as the OS-less tag
-          # (i.e. 23-el9-release -> 23-release)
+          # (i.e. 25-el9-release 25-release)
           tag2=${tag/-${DEFAULT_OS}-/-}  # bash syntax for search-and-replace
           if [[ $tag2 != $tag ]]; then
             docker buildx imagetools create --tag $tag2 $DIGESTS;