From 760f36c9de139f610436f96a2914789ea184949c Mon Sep 17 00:00:00 2001
From: Matthew Westphall <westphall@wisc.edu>
Date: Tue, 22 Oct 2024 13:30:09 -0500
Subject: [PATCH] Explicitly specify image name rather than trying to calculate

---
 .github/actions/push-digest-local/action.yaml |  3 ---
 .github/workflows/build-container.yml         | 17 +++++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/actions/push-digest-local/action.yaml b/.github/actions/push-digest-local/action.yaml
index c1ab571..4b81e1b 100644
--- a/.github/actions/push-digest-local/action.yaml
+++ b/.github/actions/push-digest-local/action.yaml
@@ -95,9 +95,6 @@ runs:
       mkdir -p /tmp/${{ inputs.registry }}/tags/
       # In harbor, upload to osg-htc instead of opensciencegrid
       TAGS=${{ steps.upload-image.outputs.image-list }}
-      if [[ ${{ inputs.registry }} == "hub.opensciencegrid.org" ]]; then
-        TAGS=$(echo $TAGS | sed 's/\/opensciencegrid/\/osg-htc/g')
-      fi
       echo $TAGS > /tmp/${{ inputs.registry }}/tags/${{ inputs.base_tag }}-${{ steps.slash-escape.outputs.platform }}
     
   - name: Upload tags
diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
index 2365646..775fbfe 100644
--- a/.github/workflows/build-container.yml
+++ b/.github/workflows/build-container.yml
@@ -21,7 +21,11 @@ jobs:
         # osg_series: ['23']
         # repo: ['development', 'testing', 'release']
         os: ['el9']
-        osg_series: ['24']
+        osg_series:
+          - series: '24'
+            image: 'osg-htc/ospool-ep'
+          - series: '23'
+            image: 'opensciencegrid/osgvo-docker-pilot'
         repo: ['development']
         platform: ['linux/amd64','linux/arm64']
         exclude:
@@ -35,11 +39,12 @@ jobs:
 
       - id: custom-image-name
         env:
-          SERIES: ${{ matrix.osg_series }}
+          SERIES: ${{ matrix.osg_series.series }}
+          IMAGE: ${{ matrix.osg_series.image }}
           REPO: ${{ matrix.repo }}
           OS: ${{ matrix.os }}
         run: |
-          PREFIX="output_image=${GITHUB_REPOSITORY/osgvo-docker-pilot/ospool-ep}:${SERIES}"
+          PREFIX="output_image=${IMAGE}:${SERIES}"
           TIMESTAMP=$(date +%Y%m%d-%H%M)
           echo "${PREFIX}-${OS}-${REPO}" >> ${GITHUB_OUTPUT}
           echo "base_tag=${SERIES}-${OS}-${REPO}" >> ${GITHUB_OUTPUT}
@@ -50,7 +55,7 @@ jobs:
         uses: opensciencegrid/build-container-action@HEAD
         with:
           registry_url: hub.opensciencegrid.org
-          osg_series: ${{ matrix.osg_series }}
+          osg_series: ${{ matrix.osg_series.series }}
           osg_repo: ${{ matrix.repo }}
           base_os: ${{ matrix.os }}
           platform: ${{ matrix.platform }}
@@ -111,7 +116,7 @@ jobs:
           registry: hub.opensciencegrid.org
           username: ${{ secrets.OSG_HARBOR_ROBOT_USER }}
           password: ${{ secrets.OSG_HARBOR_ROBOT_PASSWORD }}
-          osg_series: ${{ matrix.osg_series }}
+          osg_series: ${{ matrix.osg_series.series }}
           osg_repo: ${{ matrix.repo }}
           base_os: ${{ matrix.os }}
           platform: ${{ matrix.platform }}
@@ -157,7 +162,7 @@ jobs:
         # osg_series: ['23']
         # repo: ['development', 'testing', 'release']
         os: ['el9']
-        osg_series: ['24']
+        osg_series: ['23', '24']
         repo: ['development']
         registry: [
           {