Skip to content

Commit

Permalink
fix: Add image tag input to manual e2e workflow (#2066)
Browse files Browse the repository at this point in the history
* fix: add image tag input to manual e2e workflow

* refactor: Better description for input

* fix: Use image tag input consistently

* refactor: Provide Format for Workflow Input
  • Loading branch information
LeelaChacha authored Nov 28, 2024
1 parent 4d40611 commit 8ea2adb
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/actions/get-configuration/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ runs:
echo "k3d_version=5.7.4" >> $GITHUB_OUTPUT
echo "modulectl_version=1.1.3" >> $GITHUB_OUTPUT
echo "cert_manager_version=1.15.0" >> $GITHUB_OUTPUT
echo "klm_version_tag=PR-${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
echo "klm_version_tag=${{ github.event.inputs.image_tag || format('PR-{0}', github.event.pull_request.number) }}" >> $GITHUB_OUTPUT
echo "klm_image_repo=dev" >> $GITHUB_OUTPUT
- name: Expose environment variables
shell: bash
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/test-e2e-with-modulereleasemeta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ env:
on:
workflow_dispatch:
inputs:
image_tag:
description: With image tag for KLM image
required: true
k8s_version:
description: With Kubernetes version
required: false
Expand All @@ -24,7 +27,7 @@ jobs:
env:
ITERATIONS: 40
SLEEP_SECONDS: 30
run: ./.github/scripts/release/wait_for_image.sh ${{ env.IMAGE_REPO }}:${{ github.event.pull_request.head.sha }} ${{ env.ITERATIONS }} ${{ env.SLEEP_SECONDS}}
run: ./.github/scripts/release/wait_for_image.sh ${{ env.IMAGE_REPO }}:${{ github.event.inputs.image_tag || github.event.pull_request.head.sha }} ${{ env.ITERATIONS }} ${{ env.SLEEP_SECONDS}}
e2e-integration:
name: E2E With ModuleReleaseMeta
needs: wait-for-image-build
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ env:
on:
workflow_dispatch:
inputs:
image_tag:
description: "With image tag for KLM image (format: PR-XXX or full commit SHA)"
required: true
k8s_version:
description: With Kubernetes version
description: "With Kubernetes version (format: x.y.z)"
required: false
pull_request:
types: [ opened, edited, synchronize, reopened, ready_for_review ]
Expand All @@ -24,7 +27,7 @@ jobs:
env:
ITERATIONS: 40
SLEEP_SECONDS: 30
run: ./.github/scripts/release/wait_for_image.sh ${{ env.IMAGE_REPO }}:${{ github.event.pull_request.head.sha }} ${{ env.ITERATIONS }} ${{ env.SLEEP_SECONDS}}
run: ./.github/scripts/release/wait_for_image.sh ${{ env.IMAGE_REPO }}:${{ github.event.inputs.image_tag || github.event.pull_request.head.sha }} ${{ env.ITERATIONS }} ${{ env.SLEEP_SECONDS}}
e2e-integration:
name: E2E
needs: wait-for-image-build
Expand Down

0 comments on commit 8ea2adb

Please sign in to comment.