From 601ecaff0a460f33839731cb270de23ca035e970 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Wed, 23 Mar 2016 15:28:06 -0700 Subject: [PATCH] Run upload-to-gcs.sh after upload-finished.sh. --- hack/jenkins/job-configs/global.yaml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hack/jenkins/job-configs/global.yaml b/hack/jenkins/job-configs/global.yaml index 0a753676bb0..838d285dfdf 100644 --- a/hack/jenkins/job-configs/global.yaml +++ b/hack/jenkins/job-configs/global.yaml @@ -13,13 +13,6 @@ publishers: - postbuildscript: builders: - # Use our script for build artifacts, since it's more flexible. - - shell: | - if [[ -x ./hack/jenkins/upload-to-gcs.sh ]]; then - ./hack/jenkins/upload-to-gcs.sh - else - curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh" | bash - - fi - shell: | curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-finished.sh" > upload-finished.sh chmod +x upload-finished.sh @@ -47,6 +40,14 @@ condition-best: ABORTED steps: - shell: './upload-finished.sh ABORTED' + # Use our script for build artifacts, since it's more flexible. + # Run last since it updates latest-build.txt. + - shell: | + if [[ -x ./hack/jenkins/upload-to-gcs.sh ]]; then + ./hack/jenkins/upload-to-gcs.sh + else + curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh" | bash - + fi script-only-if-succeeded: False script-only-if-failed: False # Use the plugin for the build log, since it isn't available on Jenkins slaves.