diff options
| author | Sergii Tkachenko <sergiitk@google.com> | 2024-04-08 11:30:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-08 11:30:42 -0700 |
| commit | b7bd89d04aa660e286e90e2a4a381f539e021bca (patch) | |
| tree | f002c5383965bb2d325414e7797594625899b15b | |
| parent | 72d831d19c1b798bd3b60cd9bb87182fe0e21963 (diff) | |
| download | grpc-grpc-java-upstream-v1.58.x.tar.gz | |
buildscripts: Migrate PSM Interop to Artifact Registry (#11079) (#11092)upstream-v1.58.x
From Container Registry (gcr.io) to Artifact Registry (pkg.dev).
| -rwxr-xr-x | buildscripts/kokoro/psm-security.sh | 4 | ||||
| -rwxr-xr-x | buildscripts/kokoro/xds_k8s_lb.sh | 4 | ||||
| -rwxr-xr-x | buildscripts/kokoro/xds_url_map.sh | 4 | ||||
| -rw-r--r-- | 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 651521d8f..2f37e2a95 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 0ff85d82e..02f2ad791 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 4f160728e..3760fcd22 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 577ed73ce..ad4e8049e 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}' |