diff options
| author | Matt Mitchell <matchell@outlook.com> | 2016-04-15 19:05:15 +0300 |
|---|---|---|
| committer | Lakshmi Priya Sekar <lasekar@microsoft.com> | 2016-05-21 02:55:07 +0300 |
| commit | 8ea526381a84a7c00edee914d51c19d085f70776 (patch) | |
| tree | 729c28e0b64b2be78000f61e4708c5f176323d02 /netci.groovy | |
| parent | f1a5735fa9b24b1898bf7f64fac169f5bc6e0985 (diff) | |
Coreclr branch should be a folderized name
The / in release/1.0.0-rc2 indicates a folder in the Jenkins path to coreclr bits. Should instead use the folder name
Diffstat (limited to 'netci.groovy')
| -rw-r--r-- | netci.groovy | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/netci.groovy b/netci.groovy index 7b46871353..74df1e052a 100644 --- a/netci.groovy +++ b/netci.groovy @@ -405,10 +405,12 @@ def outerloopLinuxOSes = ['Ubuntu16.04', 'CentOS7.1', 'OpenSUSE13.2', 'RHEL7.2', // adds steps to a job to download coreclr artifacts and corefx artifacts and invoke run-test.sh. def static addCopyCoreClrAndRunTestSteps(def job, def coreclrBranch, String os, String osGroup, String fullNativeCompBuildJobName, String fullCoreFXBuildJobName, String configurationGroup, String coreClrConfigurationGroup, boolean isOuterLoop, boolean useServerGC) { + // Grab the folder name for the coreclr branch + def coreclrFolder = Utilities.getFolderName(coreclrBranch) job.with { steps { // CoreCLR - copyArtifacts("dotnet_coreclr/${coreclrBranch}/${coreClrConfigurationGroup.toLowerCase()}_${os.toLowerCase()}") { + copyArtifacts("dotnet_coreclr/${coreclrFolder}/${coreClrConfigurationGroup.toLowerCase()}_${os.toLowerCase()}") { excludePatterns('**/testResults.xml', '**/*.ni.dll') buildSelector { latestSuccessful(true) @@ -416,7 +418,7 @@ def static addCopyCoreClrAndRunTestSteps(def job, def coreclrBranch, String os, } // MSCorlib - copyArtifacts("dotnet_coreclr/${coreclrBranch}/${coreClrConfigurationGroup.toLowerCase()}_windows_nt") { + copyArtifacts("dotnet_coreclr/${coreclrFolder}/${coreClrConfigurationGroup.toLowerCase()}_windows_nt") { includePatterns("bin/Product/${osGroup}*/**") excludePatterns('**/testResults.xml', '**/*.ni.dll') buildSelector { |