From c489a936369e677fa4fc072f0d52465703bf16e1 Mon Sep 17 00:00:00 2001 From: jashook Date: Thu, 9 Nov 2017 12:53:33 -0800 Subject: [PATCH] Fix arm(64) jobs --- netci.groovy | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/netci.groovy b/netci.groovy index 174bfd2..31d0b84 100755 --- a/netci.groovy +++ b/netci.groovy @@ -1798,7 +1798,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR // Zip up the tests directory so that we don't use so much space/time copying // 10s of thousands of files around. - buildCommands += "powershell -Command \"Add-Type -Assembly 'System.IO.Compression.FileSystem'; [System.IO.Compression.ZipFile]::CreateFromDirectory('.\\bin\\tests\\${osGroup}.${architecture}.${configuration}', '.\\bin\\tests\\tests.zip')\""; + buildCommands += "powershell -Command \"Add-Type -Assembly 'System.IO.Compression.FileSystem'; [System.IO.Compression.ZipFile]::CreateFromDirectory('.\\bin\\tests\\${osGroup}.${buildArchitecture}.${configuration}', '.\\bin\\tests\\tests.zip')\""; // Add archival. Utilities.addArchival(newJob, "bin/Product/**,bin/tests/tests.zip", "bin/Product/**/.nuget/**") @@ -2803,6 +2803,10 @@ combinedScenarios.each { scenario -> addArchSpecificExclude(architecture, excludeTag) } + else { + addExclude("pri1") + } + smartyCommand += "/lstFile Tests.lst" def testListArch = [ @@ -2860,7 +2864,7 @@ combinedScenarios.each { scenario -> Utilities.addXUnitDotNETResults(newJob, '**/coreclrtests.xml') } else { - Utilities.addArchival(newJob, "bin/tests/${osGroup}.${architecture}.${configuration}/Smarty.Run.0/*.smrt") + Utilities.addArchival(newJob, "bin/tests/${osGroup}.${architecture}.${configuration}/Smarty.Run.0/*.smrt", '', true, false) } // Create a build flow to join together the build and tests required to run this -- 2.7.4