Skip to content

Commit

Permalink
add kong-effective-version input in validate kong image tests
Browse files Browse the repository at this point in the history
  • Loading branch information
randmonkey committed Nov 3, 2023
1 parent 6fb8469 commit 991612e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
1 change: 1 addition & 0 deletions .github/workflows/_e2e_tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ jobs:
TEST_KONG_LOAD_IMAGES: ${{ inputs.load-local-image }}
TEST_KONG_IMAGE: ${{ steps.split.outputs.kong-image }}
TEST_KONG_TAG: ${{ steps.split.outputs.kong-tag }}
TEST_KONG_EFFECTIVE_VERSION: ${{ inputs.kong-effective-version }}
TEST_KONG_KONNECT_ACCESS_TOKEN: ${{ secrets.K8S_TEAM_KONNECT_ACCESS_TOKEN }}
KONG_LICENSE_DATA: ${{ steps.license.outputs.license }}
GOTESTSUM_JUNITFILE: "e2e-${{ matrix.test }}${{ matrix.kubernetes-version }}-tests.xml"
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/validate_kong_image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ on:
type: string
required: true
default: "latest"
kong-effective-version:
description: Effective semantic version of Kong Gateway Docker image. If not given, the semantic version will be parsed from the image tag.
type: string
required: false
e2e-controller-image-repo:
description: KIC Docker image for E2E tests (repository).
type: string
Expand Down Expand Up @@ -68,11 +72,13 @@ jobs:
with:
kong-container-repo: ${{ github.event.inputs.kong-image-repo }}
kong-container-tag: ${{ github.event.inputs.kong-image-tag }}
kong-oss-effective-version: ${{ github.event.inputs.kong-effective-version }}
# We're passing the same image twice, because the integration tests need to know the image
# for Enterprise variant of tests separately.
# That makes this workflow usable only for Enterprise images.
kong-enterprise-container-repo: ${{ github.event.inputs.kong-image-repo }}
kong-enterprise-container-tag: ${{ github.event.inputs.kong-image-tag }}
kong-enterprise-effective-version: ${{ github.event.inputs.kong-effective-version }}

on-finish-comment-or-close-issue:
needs:
Expand Down

0 comments on commit 991612e

Please sign in to comment.