github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36949 from fejta/upload

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2016-11-16 22:20:55 -08:00 committed by GitHub
commit a988f71ef0
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hack/jenkins/upload-to-gcs.sh
View File

@ -281,13 +281,15 @@ function upload_artifacts_and_build_result() {
echo -e "\n\n\n*** View logs and artifacts at ${results_url} ***\n\n" echo -e "\n\n\n*** View logs and artifacts at ${results_url} ***\n\n"
} }
if [[ -n "${JENKINS_BUILD_STARTED:-}" ]]; then if [[ -z "${BOOTSTRAP_MIGRATION:-}" ]]; then
if [[ -n "${JENKINS_BUILD_STARTED:-}" ]]; then
upload_version upload_version
elif [[ -n "${JENKINS_BUILD_FINISHED:-}" ]]; then elif [[ -n "${JENKINS_BUILD_FINISHED:-}" ]]; then
upload_artifacts_and_build_result ${JENKINS_BUILD_FINISHED} upload_artifacts_and_build_result ${JENKINS_BUILD_FINISHED}
update_job_result_cache ${JENKINS_BUILD_FINISHED} update_job_result_cache ${JENKINS_BUILD_FINISHED}
else else
echo "Called without JENKINS_BUILD_STARTED or JENKINS_BUILD_FINISHED set." echo "ERROR: Called without JENKINS_BUILD_STARTED or JENKINS_BUILD_FINISHED set."
echo "Assuming a legacy invocation." echo "ERROR: this should not happen"
upload_artifacts_and_build_result "[UNSET]" exit 1
fi
fi fi