Skip to content

Commit

Permalink
that is required
Browse files Browse the repository at this point in the history
  • Loading branch information
laverya committed Jul 26, 2024
1 parent f75e5fd commit 841054a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions .github/actions/e2e/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ inputs:
dr-aws-secret-access-key:
description: 'Disaster Recovery AWS Secret Access Key'
required: true
# k0s-version:
# description: 'k0s version to expect after upgrades in e2e tests'
# required: true
k0s-version:
description: 'k0s version to expect after upgrades in e2e tests'
required: true

runs:
using: composite
Expand Down Expand Up @@ -107,7 +107,7 @@ runs:
export DR_AWS_S3_PREFIX_AIRGAP=${{ inputs.test-name }}-${{ github.run_id }}-${{ github.run_attempt }}-airgap
export DR_AWS_ACCESS_KEY_ID=${{ inputs.dr-aws-access-key-id }}
export DR_AWS_SECRET_ACCESS_KEY=${{ inputs.dr-aws-secret-access-key }}
# export K0S_VERSION=${{ inputs.k0s-version }}
export K0S_VERSION=${{ inputs.k0s-version }}
make e2e-test TEST_NAME=${{ inputs.test-name }}
- name: Upload Host Support Bundle
uses: actions/upload-artifact@v4
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,10 @@ jobs:
output/bin/embedded-cluster-original
output/bin/embedded-cluster-previous-k0s
output/bin/embedded-cluster-release-builder
# - name: Export K0s Version
# run: |
# make print-K0S_VERSION
# echo "k0s_version=$(make print-K0S_VERSION)" >> "$GITHUB_OUTPUT"
- name: Export K0s Version
run: |
make print-K0S_VERSION
echo "k0s_version=$(make print-K0S_VERSION)" >> "$GITHUB_OUTPUT"
check-images:
name: Check Images
Expand Down Expand Up @@ -392,7 +392,7 @@ jobs:
license: ${{ secrets.STAGING_EMBEDDED_CLUSTER_LICENSE }}
dr-aws-access-key-id: ${{ secrets.TESTIM_AWS_ACCESS_KEY_ID }}
dr-aws-secret-access-key: ${{ secrets.TESTIM_AWS_SECRET_ACCESS_KEY }}
#k0s-version: ${{ steps.build.outputs.k0s_version }}
k0s-version: ${{ steps.build.outputs.k0s_version }}

# this job will validate that all the tests passed
# it is used for the github branch protection rule
Expand Down

0 comments on commit 841054a

Please sign in to comment.