Enable installer tests in our CI.

This commit is contained in:
Eric Erhardt 2016-02-22 17:15:56 -06:00
parent 962411969e
commit 2685d282b8
3 changed files with 16 additions and 2 deletions

View file

@ -8,7 +8,7 @@ import jobs.generation.Utilities;
def project = GithubProject
def branch = GithubBranchName
def osList = ['Ubuntu', 'OSX', 'Windows_NT', 'CentOS7.1']
def osList = ['Ubuntu', 'OSX', 'Windows_NT', 'Windows_2016', 'CentOS7.1']
def static getBuildJobName(def configuration, def os) {
return configuration.toLowerCase() + '_' + os.toLowerCase()
@ -28,6 +28,9 @@ def static getBuildJobName(def configuration, def os) {
if (os == 'Windows_NT') {
buildCommand = ".\\build.cmd -Configuration ${lowerConfiguration} Default"
}
else if (os == 'Windows_2016') {
buildCommand = ".\\build.cmd -Configuration ${lowerConfiguration} -RunInstallerTestsInDocker Default"
}
else if (os == 'Ubuntu') {
buildCommand = "./build.sh --skip-prereqs --configuration ${lowerConfiguration} --docker ubuntu Default"
}
@ -39,7 +42,7 @@ def static getBuildJobName(def configuration, def os) {
def newJob = job(Utilities.getFullJobName(project, jobName, isPR)) {
// Set the label.
steps {
if (os == 'Windows_NT') {
if (os == 'Windows_NT' || os == 'Windows_2016') {
// Batch
batchFile(buildCommand)
}