From cd6ef6abe8be8190fedfedfdaaa1e543db5d94d6 Mon Sep 17 00:00:00 2001
From: Bruce Forstall <brucefo@microsoft.com>
Date: Thu, 28 Mar 2019 09:55:55 -0700
Subject: [PATCH] Restore Windows arm32/arm64 innerloop build jobs

These are required by the innerloop flow jobs.


Commit migrated from https://github.com/dotnet/coreclr/commit/51c84cbde3c1d7531a149e33cc445bee34fc081e
---
 src/coreclr/netci.groovy | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy
index 2b4355ca01c..57281680bc3 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
-- 
GitLab