From c76730114a952f9732e4ae68d6bdb3c1a7c13973 Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Fri, 22 Sep 2023 16:25:10 -0700 Subject: [PATCH] [PSM Interop] Rename GAMMA tests to CSM tests (#34452) Notes: - GAMMA tests are now a subset of a wider CSM scope - Some "gamma" files to ensure graceful renames - Should be safe to merge as is --- .../linux/grpc_xds_k8s_install_test_driver.sh | 4 +++ tools/internal_ci/linux/psm-csm.cfg | 26 +++++++++++++++++++ .../linux/{psm-gamma.sh => psm-csm.sh} | 7 ++--- tools/internal_ci/linux/psm-gamma.cfg | 3 ++- .../xds_k8s_test_driver/config/common-csm.cfg | 3 +++ .../xds_k8s_test_driver/config/gamma.cfg | 2 ++ 6 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 tools/internal_ci/linux/psm-csm.cfg rename tools/internal_ci/linux/{psm-gamma.sh => psm-csm.sh} (98%) create mode 100644 tools/run_tests/xds_k8s_test_driver/config/common-csm.cfg diff --git a/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh b/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh index 6012af87b12..bfec6b69f5f 100644 --- a/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh +++ b/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh @@ -50,6 +50,10 @@ activate_gke_cluster() { GKE_CLUSTER_NAME="psm-interop-security" GKE_CLUSTER_ZONE="us-central1-a" ;; + GKE_CLUSTER_PSM_CSM) + GKE_CLUSTER_NAME="psm-interop-csm" + GKE_CLUSTER_ZONE="us-east7-c" + ;; GKE_CLUSTER_PSM_GAMMA) GKE_CLUSTER_NAME="psm-interop-gamma" GKE_CLUSTER_ZONE="us-central1-a" diff --git a/tools/internal_ci/linux/psm-csm.cfg b/tools/internal_ci/linux/psm-csm.cfg new file mode 100644 index 00000000000..fe406f607cd --- /dev/null +++ b/tools/internal_ci/linux/psm-csm.cfg @@ -0,0 +1,26 @@ +# Copyright 2023 gRPC authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# 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/psm-csm.sh" +timeout_mins: 60 +action { + define_artifacts { + regex: "artifacts/**/*sponge_log.xml" + regex: "artifacts/**/*.log" + strip_prefix: "artifacts" + } +} diff --git a/tools/internal_ci/linux/psm-gamma.sh b/tools/internal_ci/linux/psm-csm.sh similarity index 98% rename from tools/internal_ci/linux/psm-gamma.sh rename to tools/internal_ci/linux/psm-csm.sh index 9401c7d7d63..b58e0747133 100755 --- a/tools/internal_ci/linux/psm-gamma.sh +++ b/tools/internal_ci/linux/psm-csm.sh @@ -106,7 +106,7 @@ run_test() { set -x python3 -m "tests.${test_name}" \ --flagfile="${TEST_DRIVER_FLAGFILE}" \ - --flagfile="config/gamma.cfg" \ + --flagfile="config/common-csm.cfg" \ --kube_context="${KUBE_CONTEXT}" \ --server_image="${SERVER_IMAGE_NAME}:${GIT_COMMIT}" \ --client_image="${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \ @@ -146,7 +146,7 @@ main() { echo "Sourcing test driver install script from: ${TEST_DRIVER_INSTALL_SCRIPT_URL}" source /dev/stdin <<< "$(curl -s "${TEST_DRIVER_INSTALL_SCRIPT_URL}")" - activate_gke_cluster GKE_CLUSTER_PSM_GAMMA + activate_gke_cluster GKE_CLUSTER_PSM_CSM set -x if [[ -n "${KOKORO_ARTIFACTS_DIR}" ]]; then @@ -160,7 +160,8 @@ main() { local failed_tests=0 test_suites=( "gamma.gamma_baseline_test" - # "gamma.session_affinity_test" + "gamma.affinity_test" + "app_net_ssa_test" ) for test in "${test_suites[@]}"; do run_test $test || (( ++failed_tests )) diff --git a/tools/internal_ci/linux/psm-gamma.cfg b/tools/internal_ci/linux/psm-gamma.cfg index d6dd7f1d073..6e44dca339f 100644 --- a/tools/internal_ci/linux/psm-gamma.cfg +++ b/tools/internal_ci/linux/psm-gamma.cfg @@ -15,7 +15,8 @@ # 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/psm-gamma.sh" +# TODO(sergiitk): delete when the job is renamed +build_file: "grpc/tools/internal_ci/linux/psm-csm.sh" timeout_mins: 60 action { define_artifacts { diff --git a/tools/run_tests/xds_k8s_test_driver/config/common-csm.cfg b/tools/run_tests/xds_k8s_test_driver/config/common-csm.cfg new file mode 100644 index 00000000000..eca1ca9502b --- /dev/null +++ b/tools/run_tests/xds_k8s_test_driver/config/common-csm.cfg @@ -0,0 +1,3 @@ +# Common config file for PSM CSM tests. +--resource_prefix=psm-csm +--noenable_workload_identity diff --git a/tools/run_tests/xds_k8s_test_driver/config/gamma.cfg b/tools/run_tests/xds_k8s_test_driver/config/gamma.cfg index 34c3d372ff4..42a1b7b1e4a 100644 --- a/tools/run_tests/xds_k8s_test_driver/config/gamma.cfg +++ b/tools/run_tests/xds_k8s_test_driver/config/gamma.cfg @@ -1,2 +1,4 @@ # Common config file for GAMMA PSM tests. +# TODO(sergiitk): delete when confirmed it's not used --resource_prefix=psm-gamma +--noenable_workload_identity