File tree Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Expand file tree Collapse file tree 3 files changed +11
-8
lines changed Original file line number Diff line number Diff line change @@ -19,8 +19,9 @@ set -eo pipefail
1919readonly GITHUB_REPOSITORY_NAME=" grpc-go"
2020readonly 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"
2121# # xDS test server/client Docker images
22- readonly SERVER_IMAGE_NAME=" gcr.io/grpc-testing/xds-interop/go-server"
23- readonly CLIENT_IMAGE_NAME=" gcr.io/grpc-testing/xds-interop/go-client"
22+ readonly DOCKER_REGISTRY=" us-docker.pkg.dev"
23+ readonly SERVER_IMAGE_NAME=" us-docker.pkg.dev/grpc-testing/psm-interop/go-server"
24+ readonly CLIENT_IMAGE_NAME=" us-docker.pkg.dev/grpc-testing/psm-interop/go-client"
2425readonly FORCE_IMAGE_BUILD=" ${FORCE_IMAGE_BUILD:- 0} "
2526
2627# ######################################
@@ -39,7 +40,7 @@ build_test_app_docker_images() {
3940 echo " Building Go xDS interop test app Docker images"
4041 docker build -f " ${SRC_DIR} /interop/xds/client/Dockerfile" -t " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} " " ${SRC_DIR} "
4142 docker build -f " ${SRC_DIR} /interop/xds/server/Dockerfile" -t " ${SERVER_IMAGE_NAME} :${GIT_COMMIT} " " ${SRC_DIR} "
42- gcloud -q auth configure-docker
43+ gcloud -q auth configure-docker " ${DOCKER_REGISTRY} "
4344 docker push " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} "
4445 docker push " ${SERVER_IMAGE_NAME} :${GIT_COMMIT} "
4546 if is_version_branch " ${TESTING_VERSION} " ; then
Original file line number Diff line number Diff line change @@ -19,8 +19,9 @@ set -eo pipefail
1919readonly GITHUB_REPOSITORY_NAME=" grpc-go"
2020readonly 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"
2121# # xDS test server/client Docker images
22- readonly SERVER_IMAGE_NAME=" gcr.io/grpc-testing/xds-interop/go-server"
23- readonly CLIENT_IMAGE_NAME=" gcr.io/grpc-testing/xds-interop/go-client"
22+ readonly DOCKER_REGISTRY=" us-docker.pkg.dev"
23+ readonly SERVER_IMAGE_NAME=" us-docker.pkg.dev/grpc-testing/psm-interop/go-server"
24+ readonly CLIENT_IMAGE_NAME=" us-docker.pkg.dev/grpc-testing/psm-interop/go-client"
2425readonly FORCE_IMAGE_BUILD=" ${FORCE_IMAGE_BUILD:- 0} "
2526
2627# ######################################
@@ -39,7 +40,7 @@ build_test_app_docker_images() {
3940 echo " Building Go xDS interop test app Docker images"
4041 docker build -f " ${SRC_DIR} /interop/xds/client/Dockerfile" -t " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} " " ${SRC_DIR} "
4142 docker build -f " ${SRC_DIR} /interop/xds/server/Dockerfile" -t " ${SERVER_IMAGE_NAME} :${GIT_COMMIT} " " ${SRC_DIR} "
42- gcloud -q auth configure-docker
43+ gcloud -q auth configure-docker " ${DOCKER_REGISTRY} "
4344 docker push " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} "
4445 docker push " ${SERVER_IMAGE_NAME} :${GIT_COMMIT} "
4546 if is_version_branch " ${TESTING_VERSION} " ; then
Original file line number Diff line number Diff line change @@ -19,7 +19,8 @@ set -eo pipefail
1919readonly GITHUB_REPOSITORY_NAME=" grpc-go"
2020readonly 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"
2121# # xDS test client Docker images
22- readonly CLIENT_IMAGE_NAME=" gcr.io/grpc-testing/xds-interop/go-client"
22+ readonly DOCKER_REGISTRY=" us-docker.pkg.dev"
23+ readonly CLIENT_IMAGE_NAME=" us-docker.pkg.dev/grpc-testing/psm-interop/go-client"
2324readonly FORCE_IMAGE_BUILD=" ${FORCE_IMAGE_BUILD:- 0} "
2425
2526# ######################################
@@ -35,7 +36,7 @@ readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}"
3536build_test_app_docker_images () {
3637 echo " Building Go xDS interop test app Docker images"
3738 docker build -f " ${SRC_DIR} /interop/xds/client/Dockerfile" -t " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} " " ${SRC_DIR} "
38- gcloud -q auth configure-docker
39+ gcloud -q auth configure-docker " ${DOCKER_REGISTRY} "
3940 docker push " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} "
4041 if is_version_branch " ${TESTING_VERSION} " ; then
4142 tag_and_push_docker_image " ${CLIENT_IMAGE_NAME} " " ${GIT_COMMIT} " " ${TESTING_VERSION} "
You can’t perform that action at this time.
0 commit comments