summaryrefslogtreecommitdiff
path: root/netci.groovy
diff options
context:
space:
mode:
authorjashook <jashoo@microsoft.com>2017-11-09 12:53:33 -0800
committerjashook <jashoo@microsoft.com>2017-11-09 12:59:45 -0800
commitc489a936369e677fa4fc072f0d52465703bf16e1 (patch)
treedfddb101ef23ceaaabd855a760eaa039b1708339 /netci.groovy
parent1425fce20c6c218372e33f4b2156dc7a01f79283 (diff)
downloadcoreclr-c489a936369e677fa4fc072f0d52465703bf16e1.tar.gz
coreclr-c489a936369e677fa4fc072f0d52465703bf16e1.tar.bz2
coreclr-c489a936369e677fa4fc072f0d52465703bf16e1.zip
Fix arm(64) jobs
Diffstat (limited to 'netci.groovy')
-rwxr-xr-xnetci.groovy8
1 files changed, 6 insertions, 2 deletions
diff --git a/netci.groovy b/netci.groovy
index 174bfd2453..31d0b840a8 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