xDS k8s tests: fix docker auth error in the build scripts

Docker auth needed to be done before pushing thats to the GCR.
Also add missing versioned image tagging to xds_k8s_url_map.sh.
This commit is contained in:
Sergii Tkachenko 2022-06-24 16:08:59 -07:00
parent 3be75633cb
commit 4db0cd2ac9
2 changed files with 8 additions and 8 deletions

View File

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

View File

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