From e207081274b99551fc0f53b66d467ea8f7842b41 Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:06:36 +0100 Subject: [PATCH] adopt changes from linux e2e tests on macOS (#790) --- .github/workflows/e2e-test-manual-macos.yml | 44 +++++++++++++++++++-- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-test-manual-macos.yml b/.github/workflows/e2e-test-manual-macos.yml index fc2413266..bbdc3112e 100644 --- a/.github/workflows/e2e-test-manual-macos.yml +++ b/.github/workflows/e2e-test-manual-macos.yml @@ -17,6 +17,7 @@ on: options: - "gcp" - "azure" + - "aws" default: "azure" required: true test: @@ -39,9 +40,10 @@ on: default: false required: false osImage: - description: "Full name of OS image (CSP independent image version UID)." + description: "Full name of OS image (CSP independent image version UID). Leave empty for latest debug image on main." type: string - required: true + default: "" + required: false isDebugImage: description: "Is OS image a debug image?" type: boolean @@ -88,13 +90,47 @@ jobs: key: bootstrapper-${{ github.sha }} path: "build/bootstrapper" + find-latest-image: + name: Select image + runs-on: ubuntu-22.04 + permissions: + id-token: write + contents: read + outputs: + image: ${{ steps.find-latest-image.outputs.image }}${{ steps.check-input.outputs.image }} + steps: + - name: Check input + id: check-input + shell: bash + run: | + if [[ -z "${{ inputs.osImage }}" ]]; then + echo "Using latest debug image from main." + else + echo "Using image '${{ inputs.osImage }}'." + echo "image=${{ inputs.osImage }}" >> "$GITHUB_OUTPUT" + exit 0 + fi + + - name: Checkout + uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0 + with: + ref: ${{ github.head_ref }} + + - name: Find latest image + id: find-latest-image + if: steps.check-input.outputs.image == '' + uses: ./.github/actions/find_latest_image + with: + ref: main + stream: debug + e2e-test-manual-darwin: name: "e2e Test Manual (macOS)" runs-on: macos-12 permissions: id-token: write contents: read - needs: build-bootstrapper-linux + needs: [build-bootstrapper-linux, find-latest-image] if: ${{ always() && !cancelled() && (needs.build-bootstrapper-linux.result == 'success' || needs.build-bootstrapper-linux.result == 'skipped') }} steps: - name: Install the basics @@ -151,7 +187,7 @@ jobs: azureClientSecret: ${{ secrets.AZURE_E2E_CLIENT_SECRET }} azureUserAssignedIdentity: ${{ secrets.AZURE_E2E_USER_ASSIGNED_IDENTITY }} azureResourceGroup: ${{ steps.az_resource_group_gen.outputs.res_group_name }} - osImage: ${{ github.event.inputs.osImage }} + osImage: ${{ needs.find-latest-image.outputs.image }} isDebugImage: ${{ github.event.inputs.isDebugImage }} - name: Always terminate cluster