From cc690750cf3db39d9a93c2695be81e594c3d9cd6 Mon Sep 17 00:00:00 2001
From: Thomas Stromberg <tstromberg@google.com>
Date: Fri, 19 Oct 2018 16:10:35 -0700
Subject: [PATCH] Ensure that all variables are expanded out.

---
 .../minikube_cross_build_and_upload.sh        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/hack/jenkins/minikube_cross_build_and_upload.sh b/hack/jenkins/minikube_cross_build_and_upload.sh
index 4b54c1fe23..ea9b90a9da 100755
--- a/hack/jenkins/minikube_cross_build_and_upload.sh
+++ b/hack/jenkins/minikube_cross_build_and_upload.sh
@@ -23,32 +23,32 @@
 
 set -eux -o pipefail
 
+readonly bucket="minikube-builds"
+
 declare -rx BUILD_IN_DOCKER=y
 declare -rx GOPATH=/var/lib/jenkins/go
-declare -rx ISO_BUCKET="minikube-builds/${ghprbPullId}"
+declare -rx ISO_BUCKET="${bucket}/${ghprbPullId}"
 declare -rx ISO_VERSION="testing"
 declare -rx TAG="${ghprbActualCommit}"
 
-readonly bucket="gs://minikube-builds"
 
 docker kill $(docker ps -q) || true
 docker rm $(docker ps -aq) || true
-make -j 16 all && result=$? || result=$?
+make -j 16 all && failed=$? || failed=$?
 
-gsutil cp gs://minikube-builds/logs/index.html \
-  "gs://minikube-builds/logs/${ghprbPullId}/index.html"
+gsutil cp "gs:/${bucket}/logs/index.html" \
+  "gs://${bucket}/logs/${ghprbPullId}/index.html"
 
-if [[ "${result}" -ne 0 ]]; then
+if [[ "${failed}" -ne 0 ]]; then
   echo "build failed"
-  exit "${result}"
+  exit "${failed}"
 fi
 
-
 git diff ${ghprbActualCommit} --name-only \
   $(git merge-base origin/master ${ghprbActualCommit}) \
-  | grep -q deploy/iso/minikube && rebuild_iso=1 || rebuild_iso=0
+  | grep -q deploy/iso/minikube && rebuild=1 || rebuild=0
 
-if [[ "${rebuild_iso}" -eq 1 ]]; then
+if [[ "${rebuild}" -eq 1 ]]; then
 	echo "ISO changes detected ... rebuilding ISO"
 	make release-iso
 fi
@@ -58,4 +58,4 @@ cp -r test/integration/testdata out/
 # Don't upload the buildroot artifacts if they exist
 rm -r out/buildroot || true
 
-gsutil -m cp -r out/* gs://minikube-builds/${ghprbPullId}/
+gsutil -m cp -r out/* "gs://${bucket}/${ghprbPullId}/"