upload to osg-htc instead of opensciencegrid

opensciencegrid · Oct 17, 2024 · 9a06009 · 9a06009
1 parent 9dd60fd
commit 9a06009
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 21 deletions.
diff --git a/.github/actions/push-digest-local/action.yaml b/.github/actions/push-digest-local/action.yaml
@@ -79,7 +79,7 @@ runs:
     run: |
       mkdir -p /tmp/${{ inputs.registry }}/digests
       digest="${{ steps.upload-image.outputs.digest }}"
-      touch "/tmp/${{ inputs.registry }}/digests/${digest#sha256:}"         
+      touch "/tmp/${{ inputs.registry }}/digests/${digest#sha256:}"
 
   - name: Upload digest
     uses: actions/upload-artifact@v4
@@ -93,7 +93,12 @@ runs:
     shell: bash
     run: |
       mkdir -p /tmp/${{ inputs.registry }}/tags/
-      echo ${{ steps.upload-image.outputs.image-list }} > /tmp/${{ inputs.registry }}/tags/${{ inputs.base_tag }}-${{ steps.slash-escape.outputs.platform }}
+      # 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
     uses: actions/upload-artifact@v4

diff --git a/.github/workflows/build-container.yml b/.github/workflows/build-container.yml
@@ -17,9 +17,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['el9', 'cuda_11_8_0']
-        osg_series: ['23']
-        repo: ['development', 'testing', 'release']
+        # os: ['el9', 'cuda_11_8_0']
+        # osg_series: ['23']
+        # repo: ['development', 'testing', 'release']
+        os: ['el9']
+        osg_series: ['24']
+        repo: ['development']
         platform: ['linux/amd64','linux/arm64']
         exclude:
           # cuda builds take a super long time; only do one of them
@@ -36,7 +39,7 @@ jobs:
           REPO: ${{ matrix.repo }}
           OS: ${{ matrix.os }}
         run: |
-          PREFIX="output_image=${GITHUB_REPOSITORY}:${SERIES}"
+          PREFIX="output_image=${GITHUB_REPOSITORY/osgvo-docker-pilot/ospool-ep}:${SERIES}"
           TIMESTAMP=$(date +%Y%m%d-%H%M)
           echo "${PREFIX}-${OS}-${REPO}" >> ${GITHUB_OUTPUT}
           echo "base_tag=${SERIES}-${OS}-${REPO}" >> ${GITHUB_OUTPUT}
@@ -98,10 +101,10 @@ jobs:
           fi
 
       - id: upload-by-digest-harbor
-        if: >-
-          github.ref == 'refs/heads/master' &&
-          github.event_name != 'pull_request' &&
-          github.repository_owner == 'opensciencegrid'
+        # if: >-
+        #   github.ref == 'refs/heads/master' &&
+        #   github.event_name != 'pull_request' &&
+        #   github.repository_owner == 'opensciencegrid'
         name: Upload By Digest to Harbor
         uses: ./.github/actions/push-digest-local
         with:
@@ -121,10 +124,10 @@ jobs:
       # some arch fails. Handling this scenario is future work: 
       # https://opensciencegrid.atlassian.net/browse/SOFTWARE-6010
       - id: upload-by-digest-dockerhub
-        if: >-
-          github.ref == 'refs/heads/master' &&
-          github.event_name != 'pull_request' &&
-          github.repository_owner == 'opensciencegrid'
+        # if: >-
+        #   github.ref == 'refs/heads/master' &&
+        #   github.event_name != 'pull_request' &&
+        #   github.repository_owner == 'opensciencegrid'
         name: Upload By Digest to Docker Hub
         uses: ./.github/actions/push-digest-local
         with:
@@ -141,18 +144,21 @@ jobs:
 
   merge-manifests:
     runs-on: ubuntu-latest
-    if: >-
-      github.ref == 'refs/heads/master' &&
-      github.event_name != 'pull_request' &&
-      github.repository_owner == 'opensciencegrid'
+    # if: >-
+    #   github.ref == 'refs/heads/master' &&
+    #   github.event_name != 'pull_request' &&
+    #   github.repository_owner == 'opensciencegrid'
     needs:
       - build-images
     strategy:
       fail-fast: false
       matrix:
-        os: ['el9', 'cuda_11_8_0']
-        osg_series: ['23']
-        repo: ['development', 'testing', 'release']
+        # os: ['el9', 'cuda_11_8_0']
+        # osg_series: ['23']
+        # repo: ['development', 'testing', 'release']
+        os: ['el9']
+        osg_series: ['24']
+        repo: ['development']
         registry: [
           {
             url: hub.opensciencegrid.org,