From 3ea522b543abe0c0a24af393f13b775a1532325d Mon Sep 17 00:00:00 2001 From: Xuan Wang Date: Mon, 18 Dec 2023 17:09:32 -0800 Subject: [PATCH] test/kokoro: Use the Kokoro shared install lib from the new repo (v1.55.x backport) (#6871) Co-authored-by: Sergii Tkachenko --- test/kokoro/psm-security.sh | 2 +- test/kokoro/xds_k8s_lb.sh | 2 +- test/kokoro/xds_url_map.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/kokoro/psm-security.sh b/test/kokoro/psm-security.sh index 46e3709d2e82..06c175f8b287 100755 --- a/test/kokoro/psm-security.sh +++ b/test/kokoro/psm-security.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc-go" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test server/client Docker images readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/go-server" readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/go-client" diff --git a/test/kokoro/xds_k8s_lb.sh b/test/kokoro/xds_k8s_lb.sh index a19f9c4db578..dda92a4791e9 100755 --- a/test/kokoro/xds_k8s_lb.sh +++ b/test/kokoro/xds_k8s_lb.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc-go" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test server/client Docker images readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/go-server" readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/go-client" diff --git a/test/kokoro/xds_url_map.sh b/test/kokoro/xds_url_map.sh index a571ea1f00ff..1c7b62db5fa4 100755 --- a/test/kokoro/xds_url_map.sh +++ b/test/kokoro/xds_url_map.sh @@ -17,7 +17,7 @@ set -eo pipefail # Constants readonly GITHUB_REPOSITORY_NAME="grpc-go" -readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc/${TEST_DRIVER_BRANCH:-master}/tools/internal_ci/linux/grpc_xds_k8s_install_test_driver.sh" +readonly TEST_DRIVER_INSTALL_SCRIPT_URL="https://raw.githubusercontent.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop/${TEST_DRIVER_BRANCH:-main}/.kokoro/psm_interop_kokoro_lib.sh" ## xDS test client Docker images readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/go-client" readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}"