From 991612eceeb6f865067356f8547440a7f7eaf718 Mon Sep 17 00:00:00 2001
From: Yi Tao <tao.yi@konghq.com>
Date: Fri, 3 Nov 2023 11:31:03 +0800
Subject: [PATCH] add kong-effective-version input in validate kong image tests

---
 .github/workflows/_e2e_tests.yaml          | 1 +
 .github/workflows/validate_kong_image.yaml | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/.github/workflows/_e2e_tests.yaml b/.github/workflows/_e2e_tests.yaml
index cfe93099661..c6c92ff2f01 100644
--- a/.github/workflows/_e2e_tests.yaml
+++ b/.github/workflows/_e2e_tests.yaml
@@ -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"
diff --git a/.github/workflows/validate_kong_image.yaml b/.github/workflows/validate_kong_image.yaml
index 4dd5661b7c6..acda5c20562 100644
--- a/.github/workflows/validate_kong_image.yaml
+++ b/.github/workflows/validate_kong_image.yaml
@@ -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
@@ -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: