Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions .kokoro/psm_interop_kokoro_lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ psm::cloud_run::setup() {
psm::cloud_run::get_tests() {
TESTS=(
"cloud_run_csm_inbound_test"
# TODO: Handle this test specially since it doesn't use Kubernetes.
# TODO: Handle this test specially since it doesn't use Kubernetes.
# Skip Kubernetes-specific setup like `gcloud container clusters get-credentials`.
"cloud_run_csm_outbound_test"
)
Expand Down Expand Up @@ -260,31 +260,31 @@ psm::dualstack::run_test() {
psm::tools::run_verbose python -m "tests.${test_name}" "${PSM_TEST_FLAGS[@]}"
}

# --- Fallback TESTS ------------------
# --- PSM Light TESTS ------------------

#######################################
# Fallback Test Suite setup.
# PSM Light Test Suite setup.
#
# This test does not need GKE so setting variable to skip some init
# These tests do not need GKE so setting variable to skip some init
#######################################
psm::fallback::setup() {
psm::light::setup() {
NO_GKE_CLUSTER=1
gcloud -q auth configure-docker "${DOCKER_REGISTRY}"
}

#######################################
# Prepares the list of tests in Fallback test suite.
# Prepares the list of tests in PSM Light test suite.
# Globals:
# TESTS: Populated with tests in Fallback test suite.
# TESTS: Populated with tests in PSM Light test suite.
#######################################
psm::fallback::get_tests() {
psm::light::get_tests() {
TESTS=(
"fallback_test"
)
}

#######################################
# Executes Fallback test case
# Executes PSM Light test suite
# Globals:
# PSM_TEST_FLAGS: The array with flags for the test
# GRPC_LANGUAGE: The name of gRPC languages under test
Expand All @@ -294,11 +294,11 @@ psm::fallback::get_tests() {
# Writes the output of test execution to stdout, stderr
# Test xUnit report to ${TEST_XML_OUTPUT_DIR}/${test_name}/sponge_log.xml
#######################################
psm::fallback::run_test() {
psm::light::run_test() {
local test_name="${1:?${FUNCNAME[0]} missing the test name argument}"

PSM_TEST_FLAGS+=(
"--flagfile=config/common-fallback.cfg"
"--flagfile=config/common-light.cfg"
)

psm::run::finalize_test_flags "${test_name}"
Expand Down Expand Up @@ -403,7 +403,7 @@ psm::csm::run_test() {
# BUILD_SCRIPT_DIR: Absolute path to the directory with lang-specific buildscript
# in the source repo.
# Arguments:
# Test suite name, one of (csm, dualstack, fallback, lb, security, url_map)
# Test suite name, one of (csm, dualstack, light, lb, security, url_map)
# Outputs:
# Writes the output of test execution to stdout, stderr
#######################################
Expand All @@ -418,7 +418,7 @@ psm::run() {
psm::setup::docker_image_names "${GRPC_LANGUAGE}" "${test_suite}"

case "${test_suite}" in
csm | dualstack | fallback | lb | security | url_map | cloud_run)
csm | dualstack | light | lb | security | url_map | cloud_run)
psm::setup::generic_test_suite "${test_suite}"
;;
*)
Expand Down
2 changes: 1 addition & 1 deletion config/common-fallback.cfg → config/common-light.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Common config for Fallback test
# Common config for PSM Light test suite
--control_plane_image=us-docker.pkg.dev/grpc-testing/psm-interop/test-control-plane:latest

# Disables the GCP Workload Identity feature to simplify permission control
Expand Down