mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Change the Build name for the Linux portable (#5980)

Browse source 
* Change the Build name for the Linux portable

* Update variable names
This commit is contained in:
Justin Goshi 2017-03-09 09:02:14 -10:00 • committed by GitHub
parent 132b175395
commit 3eed692185
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
netci.groovy
View file

@ -19,6 +19,7 @@ def static getBuildJobName(def configuration, def os, def architecture) {
platformList.each { platform -> platformList.each { platform ->
// Calculate names // Calculate names
def (os, architecture, configuration) = platform.tokenize(':') def (os, architecture, configuration) = platform.tokenize(':')
def osUsedForMachineAffinity = os;
// Calculate job name // Calculate job name
def jobName = getBuildJobName(configuration, os, architecture) def jobName = getBuildJobName(configuration, os, architecture)
@ -34,10 +35,10 @@ platformList.each { platform ->
else if (os == 'Ubuntu') { else if (os == 'Ubuntu') {
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu.14.04 --targets Default" buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --docker ubuntu.14.04 --targets Default"
} }
else if (os == 'Linux') { else if (os == 'Linux') {
os = 'Ubuntu16.04'; osUsedForMachineAffinity = 'Ubuntu16.04';
buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --targets Default" buildCommand = "./build.sh --linux-portable --skip-prereqs --configuration ${configuration} --targets Default"
} }
else { else {
// Jenkins non-Ubuntu CI machines don't have docker // Jenkins non-Ubuntu CI machines don't have docker
buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default" buildCommand = "./build.sh --skip-prereqs --configuration ${configuration} --targets Default"
@ -57,7 +58,7 @@ platformList.each { platform ->
} }
} }
Utilities.setMachineAffinity(newJob, os, 'latest-or-auto') Utilities.setMachineAffinity(newJob, osUsedForMachineAffinity, 'latest-or-auto')
Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}") Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
Utilities.addMSTestResults(newJob, '**/*.trx') Utilities.addMSTestResults(newJob, '**/*.trx')
Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build") Utilities.addGithubPRTriggerForBranch(newJob, branch, "${os} ${architecture} ${configuration} Build")