Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor e2e-test workflows #670

Merged
merged 1 commit into from
Feb 11, 2025
+16 −12
Merged

Refactor e2e-test workflows #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- '*'

jobs:
build-ubuntu22:
build-latest:
uses: ./.github/workflows/reusable--build.yaml
permissions:
contents: read
Expand All @@ -26,13 +26,13 @@ jobs:

e2e-test:
needs:
- build-ubuntu22
- build-latest
- build-ubuntu20
uses: ./.github/workflows/reusable--e2e-test.yaml
secrets: inherit
permissions:
contents: read
actions: write
with:
runner-image-uri-ubuntu22: ${{ needs.build-ubuntu22.outputs.image-uri }}
runner-image-uri-latest: ${{ needs.build-latest.outputs.image-uri }}
runner-image-uri-ubuntu20: ${{ needs.build-ubuntu20.outputs.image-uri }}
22 changes: 13 additions & 9 deletions .github/workflows/reusable--e2e-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: e2e-test
on:
workflow_call:
inputs:
runner-image-uri-ubuntu22:
runner-image-uri-latest:
type: string
required: true
description: Image URI of runner
description: Image URI of runner (latest)
runner-image-uri-ubuntu20:
type: string
required: true
Expand Down Expand Up @@ -41,22 +41,26 @@ jobs:
APP_INSTALLATION_ID: ${{ secrets.E2E_TEST_APP_INSTALLATION_ID }}
APP_PRIVATE_KEY: ${{ secrets.E2E_TEST_APP_PRIVATE_KEY }}
- run: make controller

- run: make runner-scale-set
env:
ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-ubuntu22
ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-ubuntu22 }}
ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-latest
ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-latest }}
- run: make runner-scale-set
env:
ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-ubuntu20
ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-ubuntu20 }}

# Register a dummy runner scale set to ensure GitHub picks the jobs.
- run: sleep 60
- run: make runner-scale-set
env:
ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-dummy
ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-ubuntu22 }}
ARC_RUNNER_IMAGE_URI: ${{ inputs.runner-image-uri-latest }}

- run: make wait-for-runner
env:
ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-ubuntu22
ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-latest
- run: make wait-for-runner
env:
ARC_RUNNER_NAME: ${{ inputs.runner-base-name }}-ubuntu20
Expand Down Expand Up @@ -86,13 +90,13 @@ jobs:
run_id: context.runId,
})

ubuntu22:
runner-latest:
uses: ./.github/workflows/reusable--e2e-test-jobs.yaml
with:
runner-name: ${{ inputs.runner-base-name }}-ubuntu22
runner-name: ${{ inputs.runner-base-name }}-latest
expected-image-os: ubuntu22

ubuntu20:
runner-ubuntu20:
uses: ./.github/workflows/reusable--e2e-test-jobs.yaml
with:
runner-name: ${{ inputs.runner-base-name }}-ubuntu20
Expand Down