From 70be5504d24818a3fec921e908ecb139d4ae77ab Mon Sep 17 00:00:00 2001 From: Xuan Wang Date: Thu, 14 Dec 2023 02:32:51 +0000 Subject: [PATCH] [PSM Interop] Point Interop Prod testing to new repo (#35305) Tests: * [x] [prod:grpc/java/v1.59.x/branch/psm-security](https://source.cloud.google.com/results/invocations/b452f79c-4766-4e0f-99fb-cbbf38a8529b) * [x] [prod:grpc/java/v1.59.x/branch/xds_k8s_lb](https://source.cloud.google.com/results/invocations/5f3baf85-3710-47b4-b1bb-df690c295e33) * [x] [prod:grpc/java/v1.59.x/branch/xds_url_map](https://source.cloud.google.com/results/invocations/61d45275-ebe7-412c-ae0a-c8932535b343) Closes #35305 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35305 from XuanWang-Amos:switch_interop_repo 4e01258f1b3c907055ac1f96b5ceac3e992069bc PiperOrigin-RevId: 590776638 --- .../linux/grpc_xds_k8s_install_test_driver.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 bfec6b69f5f..76a5eaa5e44 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 @@ -18,11 +18,11 @@ set -eo pipefail # Constants readonly PYTHON_VERSION="${PYTHON_VERSION:-3.10}" # Test driver -readonly TEST_DRIVER_REPO_NAME="grpc" -readonly TEST_DRIVER_REPO_URL="https://github.com/${TEST_DRIVER_REPO_OWNER:-grpc}/grpc.git" -readonly TEST_DRIVER_BRANCH="${TEST_DRIVER_BRANCH:-master}" -readonly TEST_DRIVER_PATH="tools/run_tests/xds_k8s_test_driver" -readonly TEST_DRIVER_PROTOS_PATH="src/proto/grpc/testing" +readonly TEST_DRIVER_REPO_NAME="psm-interop" +readonly TEST_DRIVER_REPO_URL="https://github.com/${TEST_DRIVER_REPO_OWNER:-grpc}/psm-interop.git" +readonly TEST_DRIVER_BRANCH="${TEST_DRIVER_BRANCH:-main}" +readonly TEST_DRIVER_PATH="" +readonly TEST_DRIVER_PROTOS_PATH="protos/grpc/testing" readonly FORCE_TESTING_VERSION="${FORCE_TESTING_VERSION:-}" # GKE cluster identifiers. @@ -261,7 +261,7 @@ test_driver_pip_install() { # Writes the output of `python -m grpc_tools.protoc` to stdout, stderr # Writes the list if compiled python code to stdout # Writes compiled python code with proto messages and grpc services to -# $TEST_DRIVER_FULL_DIR/src/proto +# $TEST_DRIVER_FULL_DIR/protos/grpc/testing ####################################### test_driver_compile_protos() { declare -a protos @@ -296,7 +296,7 @@ test_driver_compile_protos() { ####################################### test_driver_install() { readonly TEST_DRIVER_REPO_DIR="${1:?Usage test_driver_install TEST_DRIVER_REPO_DIR}" - readonly TEST_DRIVER_FULL_DIR="${TEST_DRIVER_REPO_DIR}/${TEST_DRIVER_PATH}" + readonly TEST_DRIVER_FULL_DIR="${TEST_DRIVER_REPO_DIR}" test_driver_get_source test_driver_pip_install test_driver_compile_protos