From 1249aa63a1ec31a6f1c1f4b201cad16d77f9c74c Mon Sep 17 00:00:00 2001
From: Gaurav Khanna <gkhanna@microsoft.com>
Date: Fri, 14 Oct 2016 19:27:06 -0700
Subject: [PATCH] Revert "Revert "Enable Win32Arm CI support""

---
 netci.groovy | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/netci.groovy b/netci.groovy
index 7661684..9b114ca 100755
--- a/netci.groovy
+++ b/netci.groovy
@@ -1089,6 +1089,9 @@ def static addTriggers(def job, def branch, def isPR, def architecture, def os,
                         Utilities.addGithubPRTriggerForBranch(job, branch, "Linux ARM Emulator Cross ${configuration} Build")
                     }
                     break
+                case 'Windows_NT':
+                    Utilities.addGithubPRTriggerForBranch(job, branch, "${os} ${architecture} Cross ${configuration} Build")
+                    break
                 default:
                     println("NYI os: ${os}");
                     assert false
@@ -1504,8 +1507,7 @@ combinedScenarios.each { scenario ->
                             }
                             break
                         case 'arm':
-                            // Only Ubuntu cross implemented
-                            if (os != 'Ubuntu') {
+                            if ((os != 'Ubuntu') && (os != 'Windows_NT')) {
                                 return
                             }
                             break
@@ -1901,6 +1903,17 @@ combinedScenarios.each { scenario ->
                                     }
                                     
                                     break
+                                case 'arm':
+                                    assert (scenario == 'default')
+                                    
+                                    // Set time out
+                                    setTestJobTimeOut(newJob, scenario)
+
+                                    buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${architecture}"
+                                    
+                                    // Add archival.
+                                    Utilities.addArchival(newJob, "bin/Product/**")
+                                    break
                                 case 'arm64':
                                     assert (scenario == 'default') || (scenario == 'pri1r2r') || (scenario == 'gcstress0x3') || (scenario == 'gcstress0xc')
                                     // Set time out
-- 
2.7.4