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.

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

fix: Manual Dispatch of E2E Worklfow #2072

14 changes: 11 additions & 3 deletions .github/actions/get-configuration/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,21 @@ runs:
id: define-variables
shell: bash
run: |
echo "k8s_version=${{ github.event.inputs.k8s_version || '1.30.3' }}" >> $GITHUB_OUTPUT
echo "istio_version=1.20.3" >> $GITHUB_OUTPUT
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=${{ github.event.inputs.image_tag || format('PR-{0}', github.event.pull_request.number) }}" >> $GITHUB_OUTPUT
echo "klm_image_repo=dev" >> $GITHUB_OUTPUT

if [[ -n "${{ github.event.pull_request.number }}" ]]; then
echo "klm_version_tag=PR-${{ github.event.pull_request.number }}" >> $GITHUB_OUTPUT
echo "klm_image_repo=dev" >> $GITHUB_OUTPUT
echo "k8s_version=1.30.3" >> $GITHUB_OUTPUT
else
# Manually executed workflow should use the latest image of main branch
echo "klm_version_tag=latest" >> $GITHUB_OUTPUT
echo "klm_image_repo=prod" >> $GITHUB_OUTPUT
echo "k8s_version=${{ github.event.inputs.k8s_version || '1.30.3' }}" >> $GITHUB_OUTPUT
fi
- name: Expose environment variables
shell: bash
run: |
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/test-e2e-with-modulereleasemeta.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
name: TestSuite E2E with ModuleReleaseMeta

env:
IMAGE_REPO: europe-docker.pkg.dev/kyma-project/dev/lifecycle-manager
on:
workflow_dispatch:
inputs:
image_tag:
description: With image tag for KLM image
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 @@ -22,12 +17,20 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set Image
run: |
if [ -n "${{ github.event.pull_request.head.sha }}" ]; then
echo "IMAGE=europe-docker.pkg.dev/kyma-project/dev/lifecycle-manager:${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
else
# Manually executed workflow should use the latest image of main branch
echo "IMAGE=europe-docker.pkg.dev/kyma-project/prod/lifecycle-manager:latest" >> $GITHUB_ENV
fi
- name: Wait for the Docker image
timeout-minutes: 20
env:
ITERATIONS: 40
SLEEP_SECONDS: 30
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}}
run: ./.github/scripts/release/wait_for_image.sh ${{ env.IMAGE }} ${{ env.ITERATIONS }} ${{ env.SLEEP_SECONDS}}
e2e-integration:
name: E2E With ModuleReleaseMeta
needs: wait-for-image-build
Expand Down
17 changes: 10 additions & 7 deletions .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
name: TestSuite E2E

env:
IMAGE_REPO: europe-docker.pkg.dev/kyma-project/dev/lifecycle-manager
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 (format: x.y.z)"
description: "With Kubernetes version (format: X.Y.Z)"
required: false
pull_request:
types: [ opened, edited, synchronize, reopened, ready_for_review ]
Expand All @@ -22,12 +17,20 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set Image
run: |
if [ -n "${{ github.event.pull_request.head.sha }}" ]; then
echo "IMAGE=europe-docker.pkg.dev/kyma-project/dev/lifecycle-manager:${{ github.event.pull_request.head.sha }}" >> $GITHUB_ENV
else
# Manually executed workflow should use the latest image of main branch
echo "IMAGE=europe-docker.pkg.dev/kyma-project/prod/lifecycle-manager:latest" >> $GITHUB_ENV
fi
- name: Wait for the Docker image
timeout-minutes: 20
env:
ITERATIONS: 40
SLEEP_SECONDS: 30
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}}
run: ./.github/scripts/release/wait_for_image.sh ${{ env.IMAGE }} ${{ env.ITERATIONS }} ${{ env.SLEEP_SECONDS}}
e2e-integration:
name: E2E
needs: wait-for-image-build
Expand Down
Loading