grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2144 from sergiitk/xds_interop_fix_docker_auth 

xDS k8s tests: fix docker auth error in the build scripts
This commit is contained in:
Michael Lumish 2022-06-24 19:30:59 -07:00 committed by GitHub
parent f832bb842c 4db0cd2ac9
commit 18dcd26e4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/grpc-js-xds/scripts/xds_k8s_lb.sh
View File

@ -31,6 +31,7 @@ readonly LANGUAGE_NAME="Node"
# BUILD_APP_PATH # BUILD_APP_PATH
# CLIENT_IMAGE_NAME: Test client Docker image name # CLIENT_IMAGE_NAME: Test client Docker image name
# GIT_COMMIT: SHA-1 of git commit being built # GIT_COMMIT: SHA-1 of git commit being built
# TESTING_VERSION: version branch under test, f.e. v1.42.x, master
# Arguments: # Arguments:
# None # None
# Outputs: # Outputs:
@ -45,15 +46,12 @@ build_test_app_docker_images() {
-t "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \ -t "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \
. .
gcloud -q auth configure-docker
docker push "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}"
if is_version_branch "${TESTING_VERSION}"; then if is_version_branch "${TESTING_VERSION}"; then
tag_and_push_docker_image "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}" "${TESTING_VERSION}" tag_and_push_docker_image "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}" "${TESTING_VERSION}"
fi fi
popd popd
gcloud -q auth configure-docker
docker push "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}"
} }
####################################### #######################################

8
packages/grpc-js-xds/scripts/xds_k8s_url_map.sh
View File

@ -30,6 +30,7 @@ readonly LANGUAGE_NAME="Node"
# BUILD_APP_PATH # BUILD_APP_PATH
# CLIENT_IMAGE_NAME: Test client Docker image name # CLIENT_IMAGE_NAME: Test client Docker image name
# GIT_COMMIT: SHA-1 of git commit being built # GIT_COMMIT: SHA-1 of git commit being built
# TESTING_VERSION: version branch under test, f.e. v1.42.x, master
# Arguments: # Arguments:
# None # None
# Outputs: # Outputs:
@ -44,11 +45,12 @@ build_test_app_docker_images() {
-t "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \ -t "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" \
. .
popd
gcloud -q auth configure-docker gcloud -q auth configure-docker
docker push "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" docker push "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}"
if is_version_branch "${TESTING_VERSION}"; then
tag_and_push_docker_image "${CLIENT_IMAGE_NAME}" "${GIT_COMMIT}" "${TESTING_VERSION}"
fi
popd
} }
####################################### #######################################