From d3387182e0249db976384c2a62fd571f69946210 Mon Sep 17 00:00:00 2001
From: Tanner Gooding <tagoo@microsoft.com>
Date: Tue, 22 Nov 2016 17:24:46 -0800
Subject: [PATCH] Further distinguish the integration tests name to
 'windows_debug_vs-integration' and 'windows_release_vs-integration'

---
 netci.groovy | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/netci.groovy b/netci.groovy
index 3ac1abb3383..85a8f054a42 100644
--- a/netci.groovy
+++ b/netci.groovy
@@ -182,23 +182,28 @@ commitPullList.each { isPr ->
   addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
 }
 
-// Integration Tests
+// VS Integration Tests
 commitPullList.each { isPr ->
-  def jobName = Utilities.getFullJobName(projectName, "integration", isPr)
-  def myJob = job(jobName) {
-    description('integration tests')
-    steps {
-      batchFile("""set TEMP=%WORKSPACE%\\Binaries\\Temp
+  ['debug', 'release'].each { configuration ->
+    ['vs-integration'].each { buildTarget ->
+      def jobName = Utilities.getFullJobName(projectName, "windows_${configuration}_${buildTarget}", isPr)
+      def myJob = job(jobName) {
+        description("Windows ${configuration} tests on ${buildTarget}")
+        steps {
+          batchFile("""set TEMP=%WORKSPACE%\\Binaries\\Temp
 mkdir %TEMP%
 set TMP=%TEMP%
-.\\cibuild.cmd /debug /testVsi""")
+.\\cibuild.cmd ${(configuration == 'debug') ? '/debug' : '/release'} /testVsi""")
+        }
+      }
+
+      def triggerPhraseOnly = false
+      def triggerPhraseExtra = ""
+      Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15-rc')
+      Utilities.addXUnitDotNETResults(myJob, '**/xUnitResults/*.xml')
+      addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
     }
   }
-
-  def triggerPhraseOnly = false
-  def triggerPhraseExtra = "integration"
-  Utilities.setMachineAffinity(myJob, 'Windows_NT', 'latest-or-auto-dev15-rc')
-  addRoslynJob(myJob, jobName, branchName, isPr, triggerPhraseExtra, triggerPhraseOnly)
 }
 
 JobReport.Report.generateJobReport(out)
-- 
GitLab