github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

e2e runner: make build start/finished upload configurable

Browse Source 
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.
This commit is contained in:
Justin Santa Barbara
2016-02-10 08:22:39 -05:00
parent 41a98b43e4
commit ba19c4e2f0
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hack/jenkins/upload-finished.sh
View File

@@ -29,9 +29,17 @@ if [[ $# -ne 1 ]]; then
exit 1 exit 1
fi 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 result="$1"
readonly timestamp=$(date +%s) 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}" echo "Uploading build result to: ${location}"
gsutil -q cp -a "public-read" <( gsutil -q cp -a "public-read" <(

10
hack/jenkins/upload-started.sh
View File

@@ -24,9 +24,17 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail 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="" version=""
readonly timestamp=$(date +%s) 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. # Try to discover the kubernetes version.
if [[ -e "version" ]]; then if [[ -e "version" ]]; then