From ba19c4e2f0fbfe5bb5bf83d5e65444a4b257cd5d Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Wed, 10 Feb 2016 08:22:39 -0500
Subject: [PATCH] e2e runner: make build start/finished upload configurable

Allow the target GCS bucket to be changed, and allow upload to GCS to be
suppressed altogether, with the same env vars that upload-to-gcs.sh
uses.
---
 hack/jenkins/upload-finished.sh | 10 +++++++++-
 hack/jenkins/upload-started.sh  | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/hack/jenkins/upload-finished.sh b/hack/jenkins/upload-finished.sh
index cb864a169e8..bf0cd6f9c15 100755
--- a/hack/jenkins/upload-finished.sh
+++ b/hack/jenkins/upload-finished.sh
@@ -29,9 +29,17 @@ if [[ $# -ne 1 ]]; then
     exit 1
 fi
 
+# TODO: DRY. Refactor into upload-to-gcs.sh ?
+: ${JENKINS_GCS_LOGS_PATH:="gs://kubernetes-jenkins/logs"}
+: ${JENKINS_UPLOAD_TO_GCS:="y"}
+
+if [[ ! ${JENKINS_UPLOAD_TO_GCS:-} =~ ^[yY]$ ]]; then
+  exit 0
+fi
+
 readonly result="$1"
 readonly timestamp=$(date +%s)
-readonly location="gs://kubernetes-jenkins/logs/${JOB_NAME}/${BUILD_NUMBER}/finished.json"
+readonly location="${JENKINS_GCS_LOGS_PATH}/${JOB_NAME}/${BUILD_NUMBER}/finished.json"
 
 echo "Uploading build result to: ${location}"
 gsutil -q cp -a "public-read" <(
diff --git a/hack/jenkins/upload-started.sh b/hack/jenkins/upload-started.sh
index 9ef612af029..1b501d0a37d 100755
--- a/hack/jenkins/upload-started.sh
+++ b/hack/jenkins/upload-started.sh
@@ -24,9 +24,17 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+# TODO: DRY. Refactor into upload-to-gcs.sh ?
+: ${JENKINS_GCS_LOGS_PATH:="gs://kubernetes-jenkins/logs"}
+: ${JENKINS_UPLOAD_TO_GCS:="y"}
+
+if [[ ! ${JENKINS_UPLOAD_TO_GCS:-} =~ ^[yY]$ ]]; then
+  exit 0
+fi
+
 version=""
 readonly timestamp=$(date +%s)
-readonly location="gs://kubernetes-jenkins/logs/${JOB_NAME}/${BUILD_NUMBER}/started.json"
+readonly location="${JENKINS_GCS_LOGS_PATH}/${JOB_NAME}/${BUILD_NUMBER}/started.json"
 
 # Try to discover the kubernetes version.
 if [[ -e "version" ]]; then