From 05eddad228e12d24f66d61e47e774f311a878e7e Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Mon, 8 Apr 2024 12:52:42 -0700 Subject: [PATCH] test/kokoro: Migrate PSM Interop to Artifact Registry Migrate PSM Interop images from Container Registry (gcr.io) to Artifact Registry (pkg.dev). RELEASE NOTES: n/a --- test/kokoro/psm-security.sh | 4 ++-- test/kokoro/xds_k8s_lb.sh | 4 ++-- test/kokoro/xds_url_map.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/test/kokoro/psm-security.sh b/test/kokoro/psm-security.sh index 06c175f8b28..3976bb3b95a 100755 --- a/test/kokoro/psm-security.sh +++ b/test/kokoro/psm-security.sh @@ -19,8 +19,8 @@ set -eo pipefail readonly GITHUB_REPOSITORY_NAME="grpc-go" 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" +readonly SERVER_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/go-server" +readonly CLIENT_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/go-client" readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}" ####################################### diff --git a/test/kokoro/xds_k8s_lb.sh b/test/kokoro/xds_k8s_lb.sh index e43b6819c26..29e8ed03dc2 100755 --- a/test/kokoro/xds_k8s_lb.sh +++ b/test/kokoro/xds_k8s_lb.sh @@ -19,8 +19,8 @@ set -eo pipefail readonly GITHUB_REPOSITORY_NAME="grpc-go" 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" +readonly SERVER_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/go-server" +readonly CLIENT_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/go-client" readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}" ####################################### diff --git a/test/kokoro/xds_url_map.sh b/test/kokoro/xds_url_map.sh index 1c7b62db5fa..ba91db5cdf0 100755 --- a/test/kokoro/xds_url_map.sh +++ b/test/kokoro/xds_url_map.sh @@ -19,7 +19,7 @@ set -eo pipefail readonly GITHUB_REPOSITORY_NAME="grpc-go" 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 CLIENT_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/go-client" readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}" #######################################