Move CLI into the open

netci.groovy

@@ -18,6 +18,7 @@ def static getBuildJobName(def configuration, def os) {
 }
 
 
+[true, false].each { isPR ->
     ['Debug', 'Release'].each { configuration ->
         osList.each { os ->
             // Calculate names
@@ -36,29 +37,7 @@ def static getBuildJobName(def configuration, def os) {
                 buildCommand = "./scripts/ci_build.sh ${lowerConfiguration}"
             }
 
-        // Create the new job
+            def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
-        def newCommitJob = job(Utilities.getFullJobName(project, jobName, false)) {
-            // Set the label.
-            label(machineLabelMap[os])
-            steps {
-                if (os == 'Windows_NT') {
-                    // Batch
-                    batchFile(buildCommand)
-                }
-                else {
-                    // Shell
-                    shell(buildCommand)
-                }
-            }
-        }
-
-        Utilities.addScm(newCommitJob, project)
-        Utilities.addStandardOptions(newCommitJob)
-        Utilities.addStandardNonPRParameters(newCommitJob)
-        Utilities.addGithubPushTrigger(newCommitJob)
-
-
-        def newPRJob = job(Utilities.getFullJobName(project, jobName, true)) {
                 // Set the label.
                 label(machineLabelMap[os])
                 steps {
@@ -85,9 +64,13 @@ def static getBuildJobName(def configuration, def os) {
             }
 
 
-        Utilities.addPrivatePRTestSCM(newPRJob, project)
+            Utilities.standardJobSetup(newJob, project, true)
-        Utilities.addStandardOptions(newPRJob)
+            if (isPR) {
-        Utilities.addStandardPRParameters(newPRJob, project)
+                Utilities.addGithubPRTrigger(newJob, "${os} ${configuration} Build")
-        Utilities.addGithubPRTrigger(newPRJob, "${os} ${configuration} Build")
+            }
+            else {
+                Utilities.addGithubPushTrigger(newJob)
+            }
+        }
     }
 }