Implement suffix image support for self-hosted workflows

astrolabsoftware · Feb 6, 2024 · a354ee1 · a354ee1
1 parent 7f542a4
commit a354ee1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/e2e-gha.yml b/.github/workflows/e2e-gha.yml
@@ -6,7 +6,7 @@ on:
       - master
 env:
   CIUXCONFIG: /tmp/ciux.sh
-  CIUX_VERSION: 927153e3f 
+  CIUX_VERSION: 927153e3f
   GHA_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
   SUFFIX: noscience
 jobs:

diff --git a/.github/workflows/e2e-noscience.yml b/.github/workflows/e2e-noscience.yml
@@ -9,7 +9,7 @@ jobs:
   call-workflow-passing-data:
     uses: ./.github/workflows/e2e.yml
     with:
-      noscience: true
+      suffix: noscience
     secrets:
       registry_username: ${{ secrets.REGISTRY_USERNAME }}
       registry_token: ${{ secrets.REGISTRY_TOKEN }}
diff --git a/.github/workflows/e2e-science.yml b/.github/workflows/e2e-science.yml
@@ -13,7 +13,7 @@ jobs:
   call-workflow-passing-data:
     uses: ./.github/workflows/e2e.yml
     with:
-      noscience: false
+      suffix: ""
     secrets:
       registry_username: ${{ secrets.REGISTRY_USERNAME }}
       registry_token: ${{ secrets.REGISTRY_TOKEN }}
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -3,7 +3,7 @@ name: "Reusable workflow for Fink self-hosted e2e tests"
 on:
   workflow_call:
     inputs:
-      noscience:
+      suffix:
         required: true
         type: string
     secrets:
@@ -13,9 +13,9 @@ on:
         required: true
 env:
   CIUXCONFIG: /tmp/ciux.sh
-  CIUX_VERSION: 927153e3f 
+  CIUX_VERSION: 927153e3f
   GHA_BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
-  NOSCIENCE: ${{ inputs.noscience }}
+  SUFFIX: ${{ inputs.suffix }}
   # Override the self-hosted runner value
   POD_NAMESPACE: default
   CI_REPO: docker-registry.docker-registry:5000
@@ -37,7 +37,7 @@ jobs:
         run: go install github.com/k8s-school/ciux@"${{ env.CIUX_VERSION }}"
       - name: Build image if not present in registry
         run: |
-            ./build.sh
+          ./build.sh -s "${{ env.SUFFIX }}" -r "${{ env.CI_REPO }}"
       - name: Push image to local registry
         id: push
         run: |