diff options
author | Jarret Shook <jashoo@microsoft.com> | 2019-03-21 10:28:29 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-21 10:28:29 -0700 |
commit | b04bccb1a60dd97b50231da0f9667b7ddbc994a7 (patch) | |
tree | f9e4fd1695017c7623e9c3d384b7bf40673dbe9b | |
parent | f2923fc03ff03742dc5004e9e673d01dc7e6e96d (diff) | |
download | coreclr-b04bccb1a60dd97b50231da0f9667b7ddbc994a7.tar.gz coreclr-b04bccb1a60dd97b50231da0f9667b7ddbc994a7.tar.bz2 coreclr-b04bccb1a60dd97b50231da0f9667b7ddbc994a7.zip |
Remove innerloop flow jobs that were missed (#23372)
* Remove innerloop flow jobs that were missed
* Correctly exclude windows x64 jobs as well
* Address pr feedback
-rwxr-xr-x | netci.groovy | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/netci.groovy b/netci.groovy index 105cf4a959..2b4355ca01 100755 --- a/netci.groovy +++ b/netci.groovy @@ -2541,7 +2541,17 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR // Returns true if the job should be generated. def static shouldGenerateJob(def scenario, def isPR, def architecture, def configuration, def os, def isBuildOnly) { - // The various "innerloop" jobs are only available as PR triggered. + // Innerloop jobs (except corefx_innerloop) are no longer created in Jenkins + if (isInnerloopTestScenario(scenario)) { + assert scenario != 'corefx_innerloop' + return false; + } + + if (!isPR) { + if (scenario == 'corefx_innerloop') { + return false + } + } if (!isPR) { if (isInnerloopTestScenario(scenario)) { @@ -3531,6 +3541,15 @@ def static shouldGenerateFlowJob(def scenario, def isPR, def architecture, def c } } + // Disable flow jobs for innerloop pr. + // + // The only exception is windows arm(64) + if (isInnerloopTestScenario(scenario) && isPR && os != 'Windows_NT') { + assert scenario != 'corefx_innerloop' + + return false; + } + // Filter based on OS and architecture. switch (architecture) { |