From a95b464c528b66e78320b5ba82ea8d1a0da29dcc Mon Sep 17 00:00:00 2001
From: Vic Iglesias <viglesias@google.com>
Date: Fri, 20 Jan 2017 16:06:20 -0800
Subject: [PATCH] Fix CI scripts (#472)

* Fix CI GOOGLE_APPLICATION_CREDENTIALS

* Revert "spinnaker: fix minio service discovery"

This reverts commit 2e5d9565a9e9b94f709bef5716006f09e0bc4339.
---
 test/changed.sh |  2 +-
 test/e2e.sh     | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/changed.sh b/test/changed.sh
index df480ab046..7e7a8cf4cd 100755
--- a/test/changed.sh
+++ b/test/changed.sh
@@ -38,7 +38,7 @@ function cleanup {
 }
 trap cleanup EXIT
 
-if [ ! -f "${KUBECONFIG}" ];then
+if [ ! -f "${KUBECONFIG:=}" ];then
   # Get credentials for test cluster
   gcloud auth activate-service-account --key-file="${GOOGLE_APPLICATION_CREDENTIALS}"
   gcloud container clusters get-credentials jenkins --project kubernetes-charts-ci --zone us-west1-a
diff --git a/test/e2e.sh b/test/e2e.sh
index a1642cf804..fb4a9b378b 100755
--- a/test/e2e.sh
+++ b/test/e2e.sh
@@ -28,11 +28,17 @@ VOLUMES="-v ${CHART_ROOT}:/src -v ${KUBECONFIG:=${HOME}/.kube/config}:/.kube/con
 GKE_CREDS=""
 if [ -f $HOME/.config/gcloud/application_default_credentials.json ];then
   GKE_CREDS="-v $HOME/.config/gcloud/application_default_credentials.json:/service-account.json:ro"
-  GKE_CREDS="${GKE_CREDS} -e GOOGLE_APPLICATION_CREDENTIALS=/service-account.json"
+  GKE_CREDS="${GKE_CREDS} -e KUBECONFIG=/.kube/config"
+elif [ -n ${GOOGLE_APPLICATION_CREDENTIALS:=} ];then
+  GKE_CREDS="-v ${GOOGLE_APPLICATION_CREDENTIALS}:/service-account.json:ro"
+else
+  echo "Unable to find a suitable value for GOOGLE_APPLICATION_CREDENTIALS"
+  exit 1
 fi
+
 docker run ${VOLUMES} ${GKE_CREDS} \
+           -e GOOGLE_APPLICATION_CREDENTIALS=/service-account.json \
            -e "PULL_NUMBER=$PULL_NUMBER" \
-           -e "KUBECONFIG=/.kube/config" \
            -e "BUILD_NUMBER=$BUILD_NUMBER" \
            -e "VERIFICATION_PAUSE=${VERIFICATION_PAUSE:=0}" \
            ${IMAGE_NAME} /src/test/changed.sh