From 77c35bbc52ab2d5f3ad0a48476d5ef2294bbcbf8 Mon Sep 17 00:00:00 2001
From: Joe Evans <github@250hacks.net>
Date: Thu, 16 Apr 2020 09:44:57 -0700
Subject: [PATCH 1/2] For mxnet-validation pipeline, require sanity build to
 complete successfully before running other build pipelines. (#17999)

* Refactor staggered builds - create new full build pipeline that runs sanity check first, then starts all other builds.

* Move list of build jobs to top of file for clarity. Preserve whole job path in case we use nested folders in the future.

Co-authored-by: Joe Evans <joeev@amazon.com>
---
 ci/jenkins/Jenkinsfile_full | 49 +++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 ci/jenkins/Jenkinsfile_full

diff --git a/ci/jenkins/Jenkinsfile_full b/ci/jenkins/Jenkinsfile_full
new file mode 100644
index 000000000000..57b637533c05
--- /dev/null
+++ b/ci/jenkins/Jenkinsfile_full
@@ -0,0 +1,49 @@
+// -*- mode: groovy -*-
+
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+// Jenkins pipeline
+// See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/
+
+// timeout in minutes
+max_time = 180
+
+def buildJobs = [
+    'centos-cpu',
+    'centos-gpu',
+    'clang',
+    'edge',
+    'miscellaneous',
+    'unix-cpu',
+    'unix-gpu',
+    'website',
+    'windows-cpu',
+    'windows-gpu'
+]
+
+
+stage("full-build") {
+    // get the base path by removing build and branch portions
+    def jobPath = JOB_NAME.split('/')
+    def pipelineName = jobPath[0..jobPath.size()-3].join('/')
+    build job: pipelineName + "/sanity/" + BRANCH_NAME, wait: true
+    buildJobs.each { subJob ->
+        build job: pipelineName + "/" + subJob + "/" + BRANCH_NAME, wait: false
+    }
+}
+

From 1c3d746f018ffdbfa228679e202c48f86769a799 Mon Sep 17 00:00:00 2001
From: Joe Evans <github@250hacks.net>
Date: Tue, 21 Apr 2020 12:36:07 -0700
Subject: [PATCH 2/2] If sanity build is not found, wait until Jenkins
 recognizes it. (#18119)

* If sanity build is not found, wait until Jenkins recognizes it.

* Also add a timeout of 30m for sanity build to run and complete, so we don't get stuck in a loop.

Co-authored-by: Joe Evans <joeev@amazon.com>
---
 ci/jenkins/Jenkinsfile_full | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/ci/jenkins/Jenkinsfile_full b/ci/jenkins/Jenkinsfile_full
index 57b637533c05..33d57d204eb1 100644
--- a/ci/jenkins/Jenkinsfile_full
+++ b/ci/jenkins/Jenkinsfile_full
@@ -21,7 +21,7 @@
 // See documents at https://jenkins.io/doc/book/pipeline/jenkinsfile/
 
 // timeout in minutes
-max_time = 180
+def max_time = 30
 
 def buildJobs = [
     'centos-cpu',
@@ -38,12 +38,24 @@ def buildJobs = [
 
 
 stage("full-build") {
-    // get the base path by removing build and branch portions
-    def jobPath = JOB_NAME.split('/')
-    def pipelineName = jobPath[0..jobPath.size()-3].join('/')
-    build job: pipelineName + "/sanity/" + BRANCH_NAME, wait: true
-    buildJobs.each { subJob ->
-        build job: pipelineName + "/" + subJob + "/" + BRANCH_NAME, wait: false
+    timeout(time: max_time, unit: 'MINUTES') {
+        // get the base path by removing build and branch portions
+        def jobPath = JOB_NAME.split('/')
+        def pipelineName = jobPath[0..jobPath.size()-3].join('/')
+        def sanityDone = false
+        while (!sanityDone) {
+            try {
+                println("Attempting to run sanity build...")
+                build job: pipelineName + "/sanity/" + BRANCH_NAME, wait: true
+                sanityDone = true
+            } catch (hudson.AbortException e) {
+                println("Job doesn't yet exist, waiting for Jenkins to find job..")
+                sleep(5)
+            }
+        }
+        buildJobs.each { subJob ->
+            build job: pipelineName + "/" + subJob + "/" + BRANCH_NAME, wait: false
+        }
     }
 }