From 430d358f70eeec4f3c9f6e146531c814df7fcc66 Mon Sep 17 00:00:00 2001
From: Sergii Tkachenko <sergiitk@google.com>
Date: Mon, 28 Aug 2023 22:54:50 -0400
Subject: [PATCH] [PSM Interop] Enable GAMMA test suite (#34193)

Enable `grpc/core/master/linux/psm-gamma` test job that runs GAMMA test
suite. Includes only the baseline test.
---
 tools/internal_ci/linux/psm-gamma.sh                 | 7 ++-----
 tools/run_tests/xds_k8s_test_driver/config/gamma.cfg | 2 ++
 2 files changed, 4 insertions(+), 5 deletions(-)
 create mode 100644 tools/run_tests/xds_k8s_test_driver/config/gamma.cfg

diff --git a/tools/internal_ci/linux/psm-gamma.sh b/tools/internal_ci/linux/psm-gamma.sh
index 2ed2f3c7423..9401c7d7d63 100755
--- a/tools/internal_ci/linux/psm-gamma.sh
+++ b/tools/internal_ci/linux/psm-gamma.sh
@@ -106,11 +106,11 @@ run_test() {
   set -x
   python3 -m "tests.${test_name}" \
     --flagfile="${TEST_DRIVER_FLAGFILE}" \
+    --flagfile="config/gamma.cfg" \
     --kube_context="${KUBE_CONTEXT}" \
     --server_image="${SERVER_IMAGE_NAME}:${GIT_COMMIT}" \
     --client_image="${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \
     --testing_version="${TESTING_VERSION}" \
-    --nocheck_local_certs \
     --force_cleanup \
     --collect_app_logs \
     --log_dir="${out_dir}" \
@@ -139,9 +139,6 @@ run_test() {
 #   Writes the output of test execution to stdout, stderr
 #######################################
 main() {
-  # TODO(sergiitk): Just a stub to create a Kokoro job. Remove tests are ready.
-  exit 0
-
   local script_dir
   script_dir="$(dirname "$0")"
 
@@ -162,7 +159,7 @@ main() {
   cd "${TEST_DRIVER_FULL_DIR}"
   local failed_tests=0
   test_suites=(
-    "gamma.baseline_test"
+    "gamma.gamma_baseline_test"
     # "gamma.session_affinity_test"
   )
   for test in "${test_suites[@]}"; do
diff --git a/tools/run_tests/xds_k8s_test_driver/config/gamma.cfg b/tools/run_tests/xds_k8s_test_driver/config/gamma.cfg
new file mode 100644
index 00000000000..34c3d372ff4
--- /dev/null
+++ b/tools/run_tests/xds_k8s_test_driver/config/gamma.cfg
@@ -0,0 +1,2 @@
+# Common config file for GAMMA PSM tests.
+--resource_prefix=psm-gamma