From 2bd69fa63f94b1f35541196062cba9cc41a76a69 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 8 Mar 2017 12:35:55 -0800 Subject: [PATCH] Add all .nuget subdirs Commit migrated from https://github.com/dotnet/coreclr/commit/641ac67c8780dbe14f15d99d0fcd896a9e133959 --- src/coreclr/netci.groovy | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/coreclr/netci.groovy b/src/coreclr/netci.groovy index 9bd2964..abaed44 100755 --- a/src/coreclr/netci.groovy +++ b/src/coreclr/netci.groovy @@ -1623,7 +1623,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR if (!Constants.jitStressModeScenarios.containsKey(scenario)) { // For windows, pull full test results and test drops for x86/x64. // No need to pull for stress mode scenarios (downstream builds use the default scenario) - Utilities.addArchival(newJob, "bin/Product/**,bin/tests/tests.zip", "bin/Product/.nuget/**") + Utilities.addArchival(newJob, "bin/Product/**,bin/tests/tests.zip", "bin/Product/**/.nuget/**") } if (scenario == 'jitdiff') { @@ -1656,7 +1656,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR buildCommands += "set __TestIntermediateDir=int&&build.cmd ${lowerConfiguration} ${architecture}" } // Add archival. - Utilities.addArchival(newJob, "bin/Product/**", "bin/Product/.nuget/**") + Utilities.addArchival(newJob, "bin/Product/**", "bin/Product/**/.nuget/**") break case 'arm64': assert (scenario == 'default') || (scenario == 'pri1r2r') || (scenario == 'gcstress0x3') || (scenario == 'gcstress0xc') @@ -1683,7 +1683,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR } // Add archival. - Utilities.addArchival(newJob, "bin/Product/**", "bin/Product/.nuget/**") + Utilities.addArchival(newJob, "bin/Product/**", "bin/Product/**/.nuget/**") break default: println("Unknown architecture: ${architecture}"); @@ -1741,7 +1741,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR // Set time out setTestJobTimeOut(newJob, scenario) // Basic archiving of the build - Utilities.addArchival(newJob, "bin/Product/**,bin/obj/*/tests/**/*.dylib,bin/obj/*/tests/**/*.so", "bin/Product/.nuget/**") + Utilities.addArchival(newJob, "bin/Product/**,bin/obj/*/tests/**/*.dylib,bin/obj/*/tests/**/*.so", "bin/Product/**/.nuget/**") // And pal tests Utilities.addXUnitDotNETResults(newJob, '**/pal_tests.xml') } @@ -1779,7 +1779,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR ROOTFS_DIR=/opt/aarch64-linux-gnu-root ./build.sh skipmscorlib arm64 cross verbose ${lowerConfiguration}""" // Basic archiving of the build, no pal tests - Utilities.addArchival(newJob, "bin/Product/**", "bin/Product/.nuget/**") + Utilities.addArchival(newJob, "bin/Product/**", "bin/Product/**/.nuget/**") break case 'arm': // All builds for ARM architecture are run on Ubuntu currently @@ -1789,7 +1789,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR ROOTFS_DIR=/opt/arm-linux-genueabihf-root ./build.sh skipmscorlib arm cross verbose ${lowerConfiguration}""" // Basic archiving of the build, no pal tests - Utilities.addArchival(newJob, "bin/Product/**", "bin/Product/.nuget/**") + Utilities.addArchival(newJob, "bin/Product/**", "bin/Product/**/.nuget/**") break } else { @@ -1819,7 +1819,7 @@ def static calculateBuildCommands(def newJob, def scenario, def branch, def isPR // Basic archiving of the build - Utilities.addArchival(newJob, "bin/Product/**", "bin/Product/.nuget/**") + Utilities.addArchival(newJob, "bin/Product/**", "bin/Product/**/.nuget/**") break } default: -- 2.7.4