Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try to add jenkins build of 'net40' without VS installed #1724

Merged
merged 1 commit into from
Nov 8, 2016
Merged

Try to add jenkins build of 'net40' without VS installed #1724

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions netci.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import jobs.generation.JobReport;
def project = GithubProject
def branch = GithubBranchName

def osList = ['Windows_NT', 'Ubuntu14.04'] //, 'OSX', 'CentOS7.1'
def osList = ['Windows_NT', 'Ubuntu14.04' ] //, 'OSX', 'CentOS7.1'

def static getBuildJobName(def configuration, def os) {
return configuration.toLowerCase() + '_' + os.toLowerCase()
}

[true, false].each { isPullRequest ->
osList.each { os ->
def configurations = ['Debug', 'Release_ci_part1', 'Release_ci_part2'];
def configurations = ['Debug', 'Release_ci_part1', 'Release_ci_part2', 'Release_net40_no_vs', ];
if (os != 'Windows_NT') {
// Only build one configuration on Linux/... so far
configurations = ['Release'];
Expand All @@ -39,6 +39,9 @@ def static getBuildJobName(def configuration, def os) {
else if (configuration == "Release_ci_part2") {
build_args = "ci_part2"
}
else if (configuration == "Release_net40_no_vs") {
build_args = "net40"
}
else {
build_args = "ci"
}
Expand Down Expand Up @@ -68,7 +71,8 @@ def static getBuildJobName(def configuration, def os) {
// TODO: set to false after tests are fully enabled
def skipIfNoTestFiles = true

Utilities.setMachineAffinity(newJob, os, os == 'Windows_NT' ? 'latest-dev15' : 'latest-or-auto')
def affinity = configuration == 'Release_net40_no_vs' ? 'latest-or-auto' : (os == 'Windows_NT' ? 'latest-dev15' : 'latest-or-auto')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have no idea where to find out what gets installed with latest-or-auto or latest-dev15 etc., or what the latest allowable values are I've searched around for Utilities.setMachineAffinity but can't find the source for those utilites

Utilities.setMachineAffinity(newJob, os, affinity)
Utilities.standardJobSetup(newJob, project, isPullRequest, "*/${branch}")
Utilities.addArchival(newJob, "tests/TestResults/*.*", "", skipIfNoTestFiles, false)
Utilities.addArchival(newJob, "${buildFlavor}/**")
Expand Down