From 2a9a7f1574e140199ac461882f4b4b0fe4be9672 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 2 Mar 2016 16:25:29 -0800 Subject: [PATCH] Fix triggers The github triggers were broken with two types of windows builds using the same context next. One was the build only job that is just used to feed into the *Nix testing. We don't need to launch these builds at all, since they are just used for internal testing. See also #3475 --- netci.groovy | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/netci.groovy b/netci.groovy index 0bcfdd8..1febbd2 100644 --- a/netci.groovy +++ b/netci.groovy @@ -179,8 +179,13 @@ def static getJobName(def configuration, def architecture, def os, def scenario, // ************************** // Adds a trigger for the PR build if one is needed. If isFlowJob is true, then this is the -// flow job that rolls up the build and test for non-windows OS's -def static addTriggers(def job, def isPR, def architecture, def os, def configuration, def scenario, def isFlowJob) { +// flow job that rolls up the build and test for non-windows OS's. // If the job is a windows build only job, +// it's just used for internal builds +def static addTriggers(def job, def isPR, def architecture, def os, def configuration, def scenario, def isFlowJob, def isWindowsBuildOnlyJob) { + if (isWindowsBuildOnlyJob) { + return + } + // Non pull request builds. if (!isPR) { // Check scenario. @@ -686,7 +691,7 @@ combinedScenarios.each { scenario -> // Add all the standard options Utilities.standardJobSetup(newJob, project, isPR, getFullBranchName(branchName)) - addTriggers(newJob, isPR, architecture, os, configuration, scenario, false) + addTriggers(newJob, isPR, architecture, os, configuration, scenario, false, isBuildOnly) def buildCommands = []; def osGroup = getOSGroup(os) @@ -1098,7 +1103,7 @@ build(params + [CORECLR_BUILD: coreclrBuildJob.build.number, } Utilities.standardJobSetup(newFlowJob, project, isPR, getFullBranchName(branchName)) - addTriggers(newFlowJob, isPR, architecture, os, configuration, scenario, true) + addTriggers(newFlowJob, isPR, architecture, os, configuration, scenario, true, false) } // configuration } // os } // architecture -- 2.7.4