separate action for finding image version

Signed-off-by: Moritz Sanft <[email protected]>
edgelesssys · Nov 9, 2023 · 43d91f7 · 43d91f7
1 parent 4a3164f
commit 43d91f7
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 63 deletions.
diff --git a/.github/actions/find_latest_image/action.yml b/.github/actions/find_latest_image/action.yml
@@ -0,0 +1,69 @@
+name: Find latest image
+description: 'Find the latest image reference for a given ref/stream.'
+
+inputs:
+  git-ref:
+    description: 'Git ref to checkout.'
+  imageVersion:
+    description: 'Image version to use. If set, no image will be searched for and the specified image will be returned.'
+  ref:
+    description: 'The ref the image was built on. (e.g. "main")'
+    default: 'main'
+  stream:
+    description: 'The publication stream of the image. (e.g. "debug")'
+    default: 'debug'
+
+outputs:
+  image:
+    description: "Image reference to be used in the cluster."
+    value: ${{ steps.find-latest-image.outputs.output }}${{ steps.check-input.outputs.image }}
+  isDebugImage:
+    description: "Whether the image is a debug image."
+    value: ${{ steps.isDebugImage.outputs.isDebugImage }}
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Checkout head
+      if: inputs.imageVersion == '' && inputs.git-ref == 'head'
+      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      with:
+        ref: ${{ !github.event.pull_request.head.repo.fork && github.head_ref || '' }}
+
+    - name: Checkout ref
+      if: inputs.imageVersion == '' && inputs.git-ref != 'head'
+      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      with:
+        ref: ${{ inputs.git-ref }}
+
+    - name: Login to AWS
+      if: inputs.imageVersion == ''
+      uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
+      with:
+        role-to-assume: arn:aws:iam::795746500882:role/GithubConstellationVersionsAPIRead
+        aws-region: eu-central-1
+
+    - name: Find latest image
+      id: find-latest-image
+      if: inputs.imageVersion == ''
+      uses: ./.github/actions/versionsapi
+      with:
+        command: latest
+        ref: main
+        stream: debug
+
+    - name: Is debug image?
+      id: isDebugImage
+      shell: bash
+      run: |
+        case "${{ inputs.imageVersion }}" in
+          "")
+            echo "isDebugImage=true" | tee -a "$GITHUB_OUTPUT"
+            ;;
+          *"/stream/debug/"*)
+            echo "isDebugImage=true" | tee -a "$GITHUB_OUTPUT"
+            ;;
+          *)
+            echo "isDebugImage=false" | tee -a "$GITHUB_OUTPUT"
+            ;;
+        esac
diff --git a/.github/workflows/e2e-test-tf-module.yml b/.github/workflows/e2e-test-tf-module.yml
@@ -6,7 +6,6 @@ on:
       ref:
         type: string
         description: "Git ref to checkout"
-        required: false
       cloudProvider:
         description: "Which cloud provider to use."
         type: choice
@@ -20,20 +19,16 @@ on:
         type: string
         required: true
       image:
-        description: "Node image version of the cluster."
+        description: "Node image reference which is compatible with the current dev release version. If not set, the latest debug image from main is used."
         type: string
-        required: true
       cliVersion:
         description: "Constellation CLI version to use. Empty value means build from source."
         type: string
-        default: ""
-        required: false
   workflow_call:
     inputs:
       ref:
         type: string
         description: "Git ref to checkout"
-        required: false
       cloudProvider:
         description: "Which cloud provider to use."
         type: string
@@ -43,14 +38,11 @@ on:
         type: string
         required: true
       image:
-        description: "Node image reference which is compatible with the current dev release version."
+        description: "Node image reference which is compatible with the current dev release version. If not set, the latest debug image from main is used."
         type: string
-        required: true
       cliVersion:
         description: "Constellation CLI version to use. Empty value means build from source."
         type: string
-        default: ""
-        required: false
 jobs:
   build:
     runs-on: ubuntu-22.04
@@ -84,15 +76,25 @@ jobs:
           last_three="${run_id: -3}"
           echo "prefix=e2e-${last_three}-${{ github.run_attempt }}" | tee -a "$GITHUB_OUTPUT"
 
+      - name: Find Latest Image
+        id: find-latest-image
+        uses: .github/actions/find_latest_image
+        with:
+          git-ref: ${{ inputs.ref }}
+          imageVersion: ${{ inputs.image }}
+          ref: main
+          stream: debug
+
       - name: Create AWS Terraform variable input file
         if: inputs.cloudProvider == 'aws'
         working-directory: ./terraform-module/aws-constellation
         run: |
           cat > terraform.tfvars <<EOF
           name = "${{ steps.create-prefix.outputs.prefix }}"
-          image = "${{ inputs.image }}"
+          image = "${{ steps.find-latest-image.outputs.image  }}"
           zone = "${{ inputs.regionZone }}"
           name_prefix = "${{ steps.create-prefix.outputs.prefix }}"
+          debug = ${{ steps.find-latest-image.outputs.debug }}
           node_groups = {
             control_plane_default = {
               role          = "control-plane"
@@ -130,6 +132,7 @@ jobs:
           location = "$location"
           service_principal_name = "${{ steps.create-prefix.outputs.prefix }}-sp"
           resource_group_name = "${{ steps.create-prefix.outputs.prefix }}-rg"
+          debug = ${{ steps.find-latest-image.outputs.debug }}
           node_groups = {
             control_plane_default = {
               role          = "control-plane"
@@ -161,6 +164,7 @@ jobs:
           service_account_id = "${{ steps.create-prefix.outputs.prefix }}-sa"
           image = "${{ inputs.image }}"
           zone = "${{ inputs.regionZone }}"
+          debug = ${{ steps.find-latest-image.outputs.debug }}
           node_groups = {
             control_plane_default = {
               role          = "control-plane"

diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -151,64 +151,18 @@ jobs:
       id-token: write
       contents: read
     outputs:
-      image: ${{ steps.find-latest-image.outputs.output }}${{ steps.check-input.outputs.image }}
-      isDebugImage: ${{ steps.isDebugImage.outputs.isDebugImage }}
+      image: ${{ steps.find-latest-image.outputs.image }}
+      isDebugImage: ${{ steps.find-latest-image.outputs.isDebugImage }}
     steps:
-      - name: Check input
-        id: check-input
-        shell: bash
-        run: |
-          if [[ -z "${{ inputs.imageVersion }}" ]]; then
-            echo "Using latest debug image from main."
-            exit 0
-          else
-            echo "image=${{ inputs.imageVersion }}" | tee -a "$GITHUB_OUTPUT"
-          fi
-
-      - name: Checkout head
-        if: inputs.imageVersion == '' && inputs.git-ref == 'head'
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-        with:
-          ref: ${{ !github.event.pull_request.head.repo.fork && github.head_ref || '' }}
-
-      - name: Checkout ref
-        if: inputs.imageVersion == '' && inputs.git-ref != 'head'
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
-        with:
-          ref: ${{ inputs.git-ref }}
-
-      - name: Login to AWS
-        if: inputs.imageVersion == ''
-        uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
-        with:
-          role-to-assume: arn:aws:iam::795746500882:role/GithubConstellationVersionsAPIRead
-          aws-region: eu-central-1
-
-      - name: Find latest image
+      - name: Find Latest Image
         id: find-latest-image
-        if: inputs.imageVersion == ''
-        uses: ./.github/actions/versionsapi
+        uses: .github/actions/find_latest_image
         with:
-          command: latest
+          git-ref: ${{ inputs.git-ref }}
+          imageVersion: ${{ inputs.imageVersion }}
           ref: main
           stream: debug
 
-      - name: Is debug image?
-        id: isDebugImage
-        shell: bash
-        run: |
-          case "${{ inputs.imageVersion }}" in
-            "")
-              echo "isDebugImage=true" | tee -a "$GITHUB_OUTPUT"
-              ;;
-            *"/stream/debug/"*)
-              echo "isDebugImage=true" | tee -a "$GITHUB_OUTPUT"
-              ;;
-            *)
-              echo "isDebugImage=false" | tee -a "$GITHUB_OUTPUT"
-              ;;
-          esac
-
   e2e-test-manual:
     runs-on: ${{ inputs.runner }}
     permissions: