diff options
| author | Bruce Forstall <brucefo@microsoft.com> | 2017-12-01 09:48:12 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-01 09:48:12 -0800 |
| commit | 73cb73ca12c626d99b6ca8acfc0abba38968e582 (patch) | |
| tree | 336f9ad3d1fe3a9975bf1f826650acdd4773bc76 /netci.groovy | |
| parent | 7dd54972258f77ebf76c1c677162f9ca5761200f (diff) | |
| parent | 9a2565863f424dc9ee3322ad87befdbf1d71b93a (diff) | |
| download | coreclr-73cb73ca12c626d99b6ca8acfc0abba38968e582.tar.gz coreclr-73cb73ca12c626d99b6ca8acfc0abba38968e582.tar.bz2 coreclr-73cb73ca12c626d99b6ca8acfc0abba38968e582.zip | |
Merge pull request #15311 from BruceForstall/FixArmFlowTriggering
Don't add triggers for arm/armlb/arm64 non-flow jobs
Diffstat (limited to 'netci.groovy')
| -rwxr-xr-x | netci.groovy | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/netci.groovy b/netci.groovy index 77a2693b3e..453e33069e 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1166,6 +1166,11 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os, } break case 'Windows_NT': + // Triggers on the non-flow jobs aren't necessary here + if (!isFlowJob) { + break + } + // Set up a private trigger def contextString = "${os} ${architecture} Cross ${configuration}" def triggerString = "(?i).*test\\W+${os}\\W+${architecture}\\W+Cross\\W+${configuration}" @@ -1262,6 +1267,11 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os, } break case 'Windows_NT': + // Triggers on the non-flow jobs aren't necessary here + if (!isFlowJob) { + break + } + assert isArmWindowsScenario(scenario) switch (scenario) { case 'default': @@ -1828,8 +1838,6 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR return buildCommands } -// Additional scenario which can alter behavior - Constants.allScenarios.each { scenario -> [true, false].each { isPR -> Constants.architectureList.each { architecture -> @@ -2059,7 +2067,7 @@ Constants.allScenarios.each { scenario -> // Add all the standard options Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") - addTriggers(newJob, branch, isPR, architecture, os, configuration, scenario, false, isBuildOnly) + addTriggers(newJob, branch, isPR, architecture, os, configuration, scenario, false, isBuildOnly) // isFlowJob==false def buildCommands = calculateBuildCommands(newJob, scenario, branch, isPR, architecture, configuration, os, isBuildOnly) def osGroup = getOSGroup(os) @@ -2741,7 +2749,7 @@ build(params + [CORECLR_BUILD: coreclrBuildJob.build.number, setMachineAffinity(newFlowJob, os, flowArch, affinityOptions) Utilities.standardJobSetup(newFlowJob, project, isPR, "*/${branch}") - addTriggers(newFlowJob, branch, isPR, architecture, os, configuration, scenario, true, false) + addTriggers(newFlowJob, branch, isPR, architecture, os, configuration, scenario, true, false) // isFlowJob==true, isWindowsBuildOnlyJob==false } // configuration } // os } // architecture |