From 4db0cd2ac995efe08185f6b825b2aa641441dc57 Mon Sep 17 00:00:00 2001
From: Sergii Tkachenko <sergiitk@google.com>
Date: Fri, 24 Jun 2022 16:08:59 -0700
Subject: [PATCH] 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.
---
 packages/grpc-js-xds/scripts/xds_k8s_lb.sh      | 8 +++-----
 packages/grpc-js-xds/scripts/xds_k8s_url_map.sh | 8 +++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/grpc-js-xds/scripts/xds_k8s_lb.sh b/packages/grpc-js-xds/scripts/xds_k8s_lb.sh
index 58a95137..ca300f0c 100755
--- a/packages/grpc-js-xds/scripts/xds_k8s_lb.sh
+++ b/packages/grpc-js-xds/scripts/xds_k8s_lb.sh
@@ -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}"
 }
 
 #######################################
diff --git a/packages/grpc-js-xds/scripts/xds_k8s_url_map.sh b/packages/grpc-js-xds/scripts/xds_k8s_url_map.sh
index 901938ad..a865e4e5 100644
--- a/packages/grpc-js-xds/scripts/xds_k8s_url_map.sh
+++ b/packages/grpc-js-xds/scripts/xds_k8s_url_map.sh
@@ -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
 }
 
 #######################################