[PSM Interop] kokoro - use common list of PSM interop tests per suite

grpc · Apr 25, 2024 · 60fde67 · 60fde67
1 parent 4da74a5
commit 60fde67
Show file tree

Hide file tree

Showing 20 changed files with 158 additions and 1,426 deletions.
diff --git a/tools/internal_ci/linux/grpc_xds_k8s_lb.cfg b/tools/internal_ci/linux/grpc_xds_k8s_lb.cfg
@@ -15,7 +15,7 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/grpc_xds_k8s_lb.sh"
+build_file: "grpc/tools/internal_ci/linux/psm-interop-test-cpp.sh"
 timeout_mins: 240
 action {
   define_artifacts {
@@ -24,3 +24,7 @@ action {
     strip_prefix: "artifacts"
   }
 }
+env_vars {
+  key: "PSM_TEST_SUITE"
+  value: "lb"
+}
diff --git a/tools/internal_ci/linux/grpc_xds_k8s_lb.sh b/tools/internal_ci/linux/grpc_xds_k8s_lb.sh
diff --git a/tools/internal_ci/linux/grpc_xds_k8s_lb_python.cfg b/tools/internal_ci/linux/grpc_xds_k8s_lb_python.cfg
@@ -15,7 +15,7 @@
 # Config file for the internal CI (in protobuf text format)
 
 # Location of the continuous shell script in repository.
-build_file: "grpc/tools/internal_ci/linux/grpc_xds_k8s_lb_python.sh"
+build_file: "grpc/tools/internal_ci/linux/psm-interop-test-python.sh"
 timeout_mins: 180
 action {
   define_artifacts {
@@ -24,3 +24,7 @@ action {
     strip_prefix: "artifacts"
   }
 }
+env_vars {
+  key: "PSM_TEST_SUITE"
+  value: "lb"
+}