diff options
author | Eric Mellino <erme@microsoft.com> | 2017-04-26 23:49:44 +0300 |
---|---|---|
committer | Eric Mellino <erme@microsoft.com> | 2017-04-27 00:23:07 +0300 |
commit | fc97d160371fd615522f80b6ff8a7e3348e5201a (patch) | |
tree | 498a115332f9707c1b96a02638434d2b235b57cb /netci.groovy | |
parent | 88ef9ecb6a68ce5038d0a9bd402a939da5d7813d (diff) |
Archive all of the binaries in outerloop CI jobs.
Diffstat (limited to 'netci.groovy')
-rw-r--r-- | netci.groovy | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/netci.groovy b/netci.groovy index 0b5a8ad7e9..0184cef844 100644 --- a/netci.groovy +++ b/netci.groovy @@ -221,6 +221,7 @@ def targetGroupOsMap = ['netcoreapp': ['Windows 10', 'Windows 7', 'Windows_NT', osForMachineAffinity = "RHEL7.2" } + def osGroup = osGroupMap[osName] def archGroup = "x64" def newJobName = "outerloop_${targetGroup}_${osShortName[osName]}_${configurationGroup.toLowerCase()}" @@ -229,21 +230,27 @@ def targetGroupOsMap = ['netcoreapp': ['Windows 10', 'Windows 7', 'Windows_NT', if (osName == 'Windows 10' || osName == 'Windows 7' || osName == 'Windows_NT') { batchFile("call \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" x86 && build.cmd -framework:${targetGroup} -${configurationGroup}") batchFile("call \"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" x86 && build-tests.cmd -framework:${targetGroup} -${configurationGroup} -outerloop -- /p:IsCIBuild=true") + batchFile("C:\\Packer\\Packer.exe .\\bin\\build.pack .\\bin") } else if (osName == 'OSX10.12') { shell("HOME=\$WORKSPACE/tempHome ./build.sh -${configurationGroup.toLowerCase()}") shell("HOME=\$WORKSPACE/tempHome ./build-tests.sh -${configurationGroup.toLowerCase()} -outerloop -- /p:IsCIBuild=true") + shell("tar -czf bin/build.tar.gz --directory=\"bin/runtime/${targetGroup}-${osGroup}-${configurationGroup}-${archGroup}\" .") } else if (osName == 'CentOS7.1') { // On Centos7.1, the cmake toolset is currently installed in /usr/local/bin (it was built manually). When // running sudo, that will be typically eliminated from the PATH, so let's add it back in. shell("sudo PATH=\$PATH:/usr/local/bin HOME=\$WORKSPACE/tempHome ./build.sh -${configurationGroup.toLowerCase()}") shell("sudo PATH=\$PATH:/usr/local/bin HOME=\$WORKSPACE/tempHome ./build-tests.sh -${configurationGroup.toLowerCase()} -outerloop -- /p:IsCIBuild=true") + shell("tar -czf bin/build.tar.gz --directory=\"bin/runtime/${targetGroup}-${osGroup}-${configurationGroup}-${archGroup}\" .") } else { def portableLinux = (osName == 'PortableLinux') ? '-portable' : '' shell("sudo HOME=\$WORKSPACE/tempHome ./build.sh -${configurationGroup.toLowerCase()} ${portableLinux}") shell("sudo HOME=\$WORKSPACE/tempHome ./build-tests.sh -${configurationGroup.toLowerCase()} -outerloop -- /p:IsCIBuild=true") + // Tar up the appropriate bits. + shell("tar -czf bin/build.tar.gz --directory=\"bin/runtime/${targetGroup}-${osGroup}-${configurationGroup}-${archGroup}\" .") + } } } @@ -252,7 +259,7 @@ def targetGroupOsMap = ['netcoreapp': ['Windows 10', 'Windows 7', 'Windows_NT', if (osName == 'Windows_NT' || osName == 'OSX10.12') { Utilities.setMachineAffinity(newJob, osForMachineAffinity, "latest-or-auto-elevated") } - else if (osGroupMap[osName] == 'Linux') { + else if (osGroup == 'Linux') { Utilities.setMachineAffinity(newJob, osForMachineAffinity, 'outer-latest-or-auto') } else { Utilities.setMachineAffinity(newJob, osForMachineAffinity, 'latest-or-auto'); @@ -262,8 +269,16 @@ def targetGroupOsMap = ['netcoreapp': ['Windows 10', 'Windows 7', 'Windows_NT', Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") // Add the unit test results Utilities.addXUnitDotNETResults(newJob, 'bin/**/testResults.xml') + def archiveContents = "msbuild.log" + if (osName.contains('Windows')) { + // Packer.exe is a .NET Framework application. When we can use it from the tool-runtime, we can archive the ".pack" file here. + archiveContents += ",bin/build.pack" + } + else { + archiveContents += ",bin/build.tar.gz" + } // Add archival for the built data. - Utilities.addArchival(newJob, "msbuild.log", '', doNotFailIfNothingArchived=true, archiveOnlyIfSuccessful=false) + Utilities.addArchival(newJob, archiveContents, '', doNotFailIfNothingArchived=true, archiveOnlyIfSuccessful=false) // Set up appropriate triggers. PR on demand, otherwise nightly if (isPR) { // Set PR trigger. |