@@ -9,7 +9,7 @@ def project = GithubProject
99def branch = GithubBranchName
1010def isPR = true
1111
12- def platformList = [' Linux:x64:Release' , ' Debian8.2:x64:Debug' , ' Ubuntu:x64:Release' , ' Ubuntu16.04:x64:Debug' , ' OSX10.12:x64:Release' , ' Windows_NT:x64:Release' , ' Windows_NT:x86:Debug' , ' RHEL7.2:x64:Release' , ' CentOS7.1:x64:Debug' ]
12+ def platformList = [' Linux:x64:Release' , ' Debian8.2:x64:Debug' , ' Ubuntu:x64:Release' , ' Ubuntu16.04:x64:Debug' , ' OSX10.12:x64:Release' , ' Windows_NT:x64:Release' , ' Windows_NT:x86:Debug' , ' RHEL7.2:x64:Release' , ' CentOS7.1:x64:Debug' , ' ubuntu.18.04:x64:Debug ' , ' fedora.27:x64:Debug ' , ' opensuse.43.2:x64:Debug ' ]
1313
1414def static getBuildJobName (def configuration , def os , def architecture ) {
1515 return configuration. toLowerCase() + ' _' + os. toLowerCase() + ' _' + architecture. toLowerCase()
@@ -20,6 +20,7 @@ platformList.each { platform ->
2020 // Calculate names
2121 def (os, architecture, configuration) = platform. tokenize(' :' )
2222 def osUsedForMachineAffinity = os;
23+ def osVersionUsedForMachineAffinity = ' latest-or-auto' ;
2324
2425 // Calculate job name
2526 def jobName = getBuildJobName(configuration, os, architecture)
@@ -39,6 +40,11 @@ platformList.each { platform ->
3940 osUsedForMachineAffinity = ' Ubuntu16.04' ;
4041 buildCommand = " ./build.sh --linux-portable --skip-prereqs --configuration ${ configuration} --targets Default"
4142 }
43+ else if (os == ' ubuntu.18.04' || os == ' fedora.27' || os == ' opensuse.43.2' ) {
44+ osUsedForMachineAffinity = ' Ubuntu16.04'
45+ osVersionUsedForMachineAffinity = ' latest-docker'
46+ buildCommand = " ./build.sh --linux-portable --skip-prereqs --configuration ${ configuration} --docker ${ os} --targets Default"
47+ }
4248 else {
4349 // Jenkins non-Ubuntu CI machines don't have docker
4450 buildCommand = " ./build.sh --skip-prereqs --configuration ${ configuration} --targets Default"
@@ -58,7 +64,7 @@ platformList.each { platform ->
5864 }
5965 }
6066
61- Utilities . setMachineAffinity(newJob, osUsedForMachineAffinity, ' latest-or-auto ' )
67+ Utilities . setMachineAffinity(newJob, osUsedForMachineAffinity, osVersionUsedForMachineAffinity )
6268 Utilities . standardJobSetup(newJob, project, isPR, " */${ branch} " )
6369 Utilities . addMSTestResults(newJob, ' **/*.trx' )
6470 Utilities . addGithubPRTriggerForBranch(newJob, branch, " ${ os} ${ architecture} ${ configuration} Build" )
0 commit comments