diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy index 2b4355ca01c217e940b505fb9ff823860f272e5d..57281680bc3d439b4311b75ba9bd76de862cf2dc 100755 --- a/src/coreclr/netci.groovy +++ b/src/coreclr/netci.groovy @@ -2541,18 +2541,15 @@ 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) { + def windowsArmJob = ((os == "Windows_NT") && (architecture in Constants.armWindowsCrossArchitectureList)) + // Innerloop jobs (except corefx_innerloop) are no longer created in Jenkins - if (isInnerloopTestScenario(scenario)) { + // The only exception is windows arm(64) + if (isInnerloopTestScenario(scenario) && isPR && !windowsArmJob) { assert scenario != 'corefx_innerloop' return false; } - if (!isPR) { - if (scenario == 'corefx_innerloop') { - return false - } - } - if (!isPR) { if (isInnerloopTestScenario(scenario)) { return false