From f246833876c83f0cec62f76b58d39e832e4e4a36 Mon Sep 17 00:00:00 2001
From: Michael Lumish <mlumish@google.com>
Date: Thu, 20 Aug 2020 14:00:46 -0700
Subject: [PATCH] Some test script fixes

---
 packages/grpc-js/scripts/xds.sh | 10 +---------
 run-tests.sh                    |  3 +++
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/grpc-js/scripts/xds.sh b/packages/grpc-js/scripts/xds.sh
index 1b6fde5d..a4c44fae 100755
--- a/packages/grpc-js/scripts/xds.sh
+++ b/packages/grpc-js/scripts/xds.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-nvm use 12
-
 set -exu -o pipefail
 [[ -f /VERSION ]] && cat /VERSION
 
@@ -11,14 +9,8 @@ base=$(pwd)
 npm run compile
 
 cd ../../..
-branch=$(git branch --all --no-color --contains "${KOKORO_GITHUB_COMMIT}" \
-    | grep -v HEAD | head -1)
-shopt -s extglob
-branch="${branch//[[:space:]]}"
-branch="${branch##remotes/origin/}"
-shopt -u extglob
 
-git clone -b "${branch}" --single-branch --depth=1 https://github.com/grpc/grpc.git
+git clone -b remotes/origin/ --single-branch --depth=1 https://github.com/grpc/grpc.git
 
 grpc/tools/run_tests/helper_scripts/prep_xds.sh
 
diff --git a/run-tests.sh b/run-tests.sh
index ca4501d0..55a08e49 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -77,6 +77,9 @@ done
 
 if [ "$OS" = "Linux" ]
 then
+  set +ex
+  nvm use 12
+  set -ex
   # Run the xds interop tests only on Linux
   ./packages/grpc-js/scripts/xds.sh
 fi