Merge pull request #23405 from ixdy/jenkins-job-configs

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.