Merge pull request #24066 from janvorli/put-back-cpu-limits

[platform/upstream/coreclr.git] / netci.groovy

diff --git a/netci.groovy b/netci.groovy
index 2b4355c..4a765c8 100755 (executable)
--- a/netci.groovy
+++ b/netci.groovy
@@ -1527,6 +1527,9 @@ def static addNonPRTriggers(def job, def branch, def isPR, def architecture, def
                     // These jobs are very fast on Linux/arm64 hardware, so run them daily.
                     addPeriodicTriggerHelper(job, '@daily')
                 }
+                else if (scenario == 'corefx_baseline') {
+                    addPeriodicTriggerHelper(job, '@daily')
+                }
                 else {
                     addPeriodicTriggerHelper(job, '@weekly')
                 }
@@ -2541,19 +2544,16 @@ 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
         }