Skip to content

Commit 34e241a

Browse files
authored
buildscripts: Migrate PSM Interop to Artifact Registry (#11079)
From Container Registry (gcr.io) to Artifact Registry (pkg.dev).
1 parent 167a203 commit 34e241a

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

buildscripts/kokoro/psm-security.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ set -eo pipefail
55
readonly GITHUB_REPOSITORY_NAME="grpc-java"
66
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"
77
## xDS test server/client Docker images
8-
readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-server"
9-
readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-client"
8+
readonly SERVER_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-server"
9+
readonly CLIENT_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-client"
1010
readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}"
1111
readonly BUILD_APP_PATH="interop-testing/build/install/grpc-interop-testing"
1212

buildscripts/kokoro/xds_k8s_lb.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ set -eo pipefail
55
readonly GITHUB_REPOSITORY_NAME="grpc-java"
66
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"
77
## xDS test server/client Docker images
8-
readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-server"
9-
readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-client"
8+
readonly SERVER_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-server"
9+
readonly CLIENT_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-client"
1010
readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}"
1111
readonly BUILD_APP_PATH="interop-testing/build/install/grpc-interop-testing"
1212

buildscripts/kokoro/xds_url_map.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ set -eo pipefail
55
readonly GITHUB_REPOSITORY_NAME="grpc-java"
66
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"
77
## xDS test client Docker images
8-
readonly SERVER_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-server"
9-
readonly CLIENT_IMAGE_NAME="gcr.io/grpc-testing/xds-interop/java-client"
8+
readonly SERVER_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-server"
9+
readonly CLIENT_IMAGE_NAME="us-docker.pkg.dev/grpc-testing/psm-interop/java-client"
1010
readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}"
1111
readonly BUILD_APP_PATH="interop-testing/build/install/grpc-interop-testing"
1212

buildscripts/xds-k8s/cloudbuild.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ steps:
1616
- '.'
1717

1818
substitutions:
19-
_SERVER_IMAGE_NAME: gcr.io/grpc-testing/xds-interop/java-server
20-
_CLIENT_IMAGE_NAME: gcr.io/grpc-testing/xds-interop/java-client
19+
_SERVER_IMAGE_NAME: us-docker.pkg.dev/grpc-testing/psm-interop/java-server
20+
_CLIENT_IMAGE_NAME: us-docker.pkg.dev/grpc-testing/psm-interop/java-client
2121

2222
images:
2323
- '${_SERVER_IMAGE_NAME}:${COMMIT_SHA}'

0 commit comments

Comments
 (0)