Merge pull request #36949 from fejta/upload

Automatic merge from submit-queue Require BOOTSTRAP_MIGRATION, JENKINS_BUILD_STARTED or JENKINS_BUILD_F… If we do not do this then we upload finished.json and update latest-build.txt before the build fiinshes, breaking the SQ

Merge pull request #36949 from fejta/upload
a988f71e · Kubernetes Submit Queue · GitHub · db72f92c · 32e2f220 · a988f71e
Commit a988f71e authored Nov 16, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 16, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 9 deletions

upload-to-gcs.sh hack/jenkins/upload-to-gcs.sh +11 -9

No files found.
--- 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