From 0342a49b96fded2adc4b6793f7333fe81158a38d Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Fri, 5 Apr 2024 17:42:08 -0700 Subject: [PATCH] buildscripts: Migrate PSM Interop to Artifact Registry From Container Registry (gcr.io) to Artifact Registry (pkg.dev). --- buildscripts/kokoro/psm-security.sh | 4 ++-- buildscripts/kokoro/xds_k8s_lb.sh | 4 ++-- buildscripts/kokoro/xds_url_map.sh | 4 ++-- buildscripts/xds-k8s/cloudbuild.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/buildscripts/kokoro/psm-security.sh b/buildscripts/kokoro/psm-security.sh index 651521d8fc6..2f37e2a95c5 100755 --- a/buildscripts/kokoro/psm-security.sh +++ b/buildscripts/kokoro/psm-security.sh @@ -5,8 +5,8 @@ set -eo pipefail readonly GITHUB_REPOSITORY_NAME="grpc-java" 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/java-server" -readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-client" +readonly SERVER_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-server" +readonly CLIENT_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-client" readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}" readonly BUILD_APP_PATH="interop-testing/build/install/grpc-interop-testing" diff --git a/buildscripts/kokoro/xds_k8s_lb.sh b/buildscripts/kokoro/xds_k8s_lb.sh index 0ff85d82e8e..02f2ad7915c 100755 --- a/buildscripts/kokoro/xds_k8s_lb.sh +++ b/buildscripts/kokoro/xds_k8s_lb.sh @@ -5,8 +5,8 @@ set -eo pipefail readonly GITHUB_REPOSITORY_NAME="grpc-java" 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/java-server" -readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-client" +readonly SERVER_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-server" +readonly CLIENT_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-client" readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}" readonly BUILD_APP_PATH="interop-testing/build/install/grpc-interop-testing" diff --git a/buildscripts/kokoro/xds_url_map.sh b/buildscripts/kokoro/xds_url_map.sh index 4f160728eb8..3760fcd229c 100755 --- a/buildscripts/kokoro/xds_url_map.sh +++ b/buildscripts/kokoro/xds_url_map.sh @@ -5,8 +5,8 @@ set -eo pipefail readonly GITHUB_REPOSITORY_NAME="grpc-java" 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 SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-server" -readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-client" +readonly SERVER_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-server" +readonly CLIENT_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-client" readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}" readonly BUILD_APP_PATH="interop-testing/build/install/grpc-interop-testing" diff --git a/buildscripts/xds-k8s/cloudbuild.yaml b/buildscripts/xds-k8s/cloudbuild.yaml index 577ed73ce58..ad4e8049e22 100644 --- a/buildscripts/xds-k8s/cloudbuild.yaml +++ b/buildscripts/xds-k8s/cloudbuild.yaml @@ -16,8 +16,8 @@ steps: - '.' substitutions: - _SERVER_IMAGE_NAME: gcr.io/grpc-testing/xds-interop/java-server - _CLIENT_IMAGE_NAME: gcr.io/grpc-testing/xds-interop/java-client + _SERVER_IMAGE_NAME: us-docker.pkg.dev/grpc-testing/psm-interop/java-server + _CLIENT_IMAGE_NAME: us-docker.pkg.dev/grpc-testing/psm-interop/java-client images: - '${_SERVER_IMAGE_NAME}:${COMMIT_SHA}'