File tree 3 files changed +11
-8
lines changed
3 files changed +11
-8
lines changed Original file line number Diff line number Diff line change @@ -19,8 +19,9 @@ set -eo pipefail
19
19
readonly GITHUB_REPOSITORY_NAME=" grpc-go"
20
20
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"
21
21
# # 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"
24
25
readonly FORCE_IMAGE_BUILD=" ${FORCE_IMAGE_BUILD:- 0} "
25
26
26
27
# ######################################
@@ -39,7 +40,7 @@ build_test_app_docker_images() {
39
40
echo " Building Go xDS interop test app Docker images"
40
41
docker build -f " ${SRC_DIR} /interop/xds/client/Dockerfile" -t " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} " " ${SRC_DIR} "
41
42
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} "
43
44
docker push " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} "
44
45
docker push " ${SERVER_IMAGE_NAME} :${GIT_COMMIT} "
45
46
if is_version_branch " ${TESTING_VERSION} " ; then
Original file line number Diff line number Diff line change @@ -19,8 +19,9 @@ set -eo pipefail
19
19
readonly GITHUB_REPOSITORY_NAME=" grpc-go"
20
20
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"
21
21
# # 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"
24
25
readonly FORCE_IMAGE_BUILD=" ${FORCE_IMAGE_BUILD:- 0} "
25
26
26
27
# ######################################
@@ -39,7 +40,7 @@ build_test_app_docker_images() {
39
40
echo " Building Go xDS interop test app Docker images"
40
41
docker build -f " ${SRC_DIR} /interop/xds/client/Dockerfile" -t " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} " " ${SRC_DIR} "
41
42
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} "
43
44
docker push " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} "
44
45
docker push " ${SERVER_IMAGE_NAME} :${GIT_COMMIT} "
45
46
if is_version_branch " ${TESTING_VERSION} " ; then
Original file line number Diff line number Diff line change @@ -19,7 +19,8 @@ set -eo pipefail
19
19
readonly GITHUB_REPOSITORY_NAME=" grpc-go"
20
20
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"
21
21
# # 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"
23
24
readonly FORCE_IMAGE_BUILD=" ${FORCE_IMAGE_BUILD:- 0} "
24
25
25
26
# ######################################
@@ -35,7 +36,7 @@ readonly FORCE_IMAGE_BUILD="${FORCE_IMAGE_BUILD:-0}"
35
36
build_test_app_docker_images () {
36
37
echo " Building Go xDS interop test app Docker images"
37
38
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} "
39
40
docker push " ${CLIENT_IMAGE_NAME} :${GIT_COMMIT} "
40
41
if is_version_branch " ${TESTING_VERSION} " ; then
41
42
tag_and_push_docker_image " ${CLIENT_IMAGE_NAME} " " ${GIT_COMMIT} " " ${TESTING_VERSION} "
You can’t perform that action at this time.
0 commit comments