From 32e2f220195bfbb648fdb3aee37bd93d720dc91a Mon Sep 17 00:00:00 2001 From: Erick Fejta Date: Wed, 16 Nov 2016 16:37:59 -0800 Subject: [PATCH] Require BOOTSTRAP_MIGRATION, JENKINS_BUILD_STARTED or JENKINS_BUILD_FINISHED --- hack/jenkins/upload-to-gcs.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/hack/jenkins/upload-to-gcs.sh b/hack/jenkins/upload-to-gcs.sh index 94b2c542e14..aca420eeb29 100755 --- a/hack/jenkins/upload-to-gcs.sh +++ b/hack/jenkins/upload-to-gcs.sh @@ -281,13 +281,15 @@ function upload_artifacts_and_build_result() { echo -e "\n\n\n*** View logs and artifacts at ${results_url} ***\n\n" } -if [[ -n "${JENKINS_BUILD_STARTED:-}" ]]; then - upload_version -elif [[ -n "${JENKINS_BUILD_FINISHED:-}" ]]; then - upload_artifacts_and_build_result ${JENKINS_BUILD_FINISHED} - update_job_result_cache ${JENKINS_BUILD_FINISHED} -else - echo "Called without JENKINS_BUILD_STARTED or JENKINS_BUILD_FINISHED set." - echo "Assuming a legacy invocation." - upload_artifacts_and_build_result "[UNSET]" +if [[ -z "${BOOTSTRAP_MIGRATION:-}" ]]; then + if [[ -n "${JENKINS_BUILD_STARTED:-}" ]]; then + upload_version + elif [[ -n "${JENKINS_BUILD_FINISHED:-}" ]]; then + upload_artifacts_and_build_result ${JENKINS_BUILD_FINISHED} + update_job_result_cache ${JENKINS_BUILD_FINISHED} + else + echo "ERROR: Called without JENKINS_BUILD_STARTED or JENKINS_BUILD_FINISHED set." + echo "ERROR: this should not happen" + exit 1 + fi fi