From f8cd1380541e3baecbd242bd7e4434b4b4a2a140 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 19 Aug 2013 12:36:50 -0700 Subject: [PATCH 1/4] changes to jobs.groovy to build on OS X --- jenkins/jobs.groovy | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 24e4779fa1..8c63b3a8f8 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -108,14 +108,34 @@ def targets = [ 'pairing-server':true, 'space-server':true, 'voxel-server':true, - 'interface':false, ] /* setup all of the target jobs to use the above template */ for (target in targets) { - queue hifiJob(target.key, target.value) + queue hifiJob(target.key, target.value) } +/* setup the UNIX and OS X interface builds */ +interfaceUnixJob = hifiJob('interface', false) +interfaceUnixJob.with { + name 'hifi-interface-unix' +} + +queue interfaceUnixJob + +interfaceAppleJob = hifiJob('interface', false) +interfaceAppleJob.with { + name 'hifi-interface-osx' + configure { project -> + project << { + assignedNode 'interface-mini' + canRoam false + } + } +} + +queue interfaceAppleJob + /* setup the parametrized build job for builds from jenkins */ parameterizedJob = hifiJob('$TARGET', true) parameterizedJob.with { From 9ee66288ab9f1964b471bd91168dc4e68efd6549 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 19 Aug 2013 13:09:05 -0700 Subject: [PATCH 2/4] switch to shallow clone for checkouts, os x build from stable --- jenkins/jobs.groovy | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 8c63b3a8f8..f0e0e732a3 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -10,9 +10,10 @@ def hifiJob(String targetName, Boolean deploy) { scm { git(GIT_REPO_URL, 'master') { node -> - node / includedRegions << "${targetName}/.*\nlibraries/.*" - node / 'userRemoteConfigs' / 'hudson.plugins.git.UserRemoteConfig' / 'name' << '' - node / 'userRemoteConfigs' / 'hudson.plugins.git.UserRemoteConfig' / 'refspec' << '' + node << { + includedRegions "${targetName}/.*\nlibraries/.*" + useShallowClone true + } } } @@ -112,20 +113,23 @@ def targets = [ /* setup all of the target jobs to use the above template */ for (target in targets) { - queue hifiJob(target.key, target.value) + queue hifiJob(target.key, target.value) } -/* setup the UNIX and OS X interface builds */ -interfaceUnixJob = hifiJob('interface', false) -interfaceUnixJob.with { - name 'hifi-interface-unix' -} - -queue interfaceUnixJob - +/* setup the OS X interface builds */ interfaceAppleJob = hifiJob('interface', false) interfaceAppleJob.with { name 'hifi-interface-osx' + + scm { + git(GIT_REPO_URL, 'stable') { node -> + node << { + includedRegions "interface/.*\nlibraries/.*" + useShallowClone true + } + } + } + configure { project -> project << { assignedNode 'interface-mini' From d8798b7ed611ae98abf310f2a48bed50c89b2083 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 19 Aug 2013 13:16:16 -0700 Subject: [PATCH 3/4] coalesce interfaceAppleJob name with name of generated job --- jenkins/jobs.groovy | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index f0e0e732a3..c0d5081d5c 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -117,8 +117,8 @@ for (target in targets) { } /* setup the OS X interface builds */ -interfaceAppleJob = hifiJob('interface', false) -interfaceAppleJob.with { +interfaceOSXJob = hifiJob('interface', false) +interfaceOSXJob.with { name 'hifi-interface-osx' scm { @@ -152,7 +152,11 @@ parameterizedJob.with { } scm { git('git@github.com:/$GITHUB_USER/hifi.git', '$GIT_BRANCH') { node -> - node / 'wipeOutWorkspace' << true + node << { + wipeOutWorkspace true + useShallowClone true + } + } } configure { project -> @@ -168,7 +172,11 @@ parameterizedJob.with { doxygenJob = hifiJob('docs', false) doxygenJob.with { scm { - git(GIT_REPO_URL, 'master') {} + git(GIT_REPO_URL, 'master') { node -> + node << { + useShallowClone true + } + } } configure { project -> From 42c69ba77f7990dce8da6a29d66f1dec52ac95bb Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 19 Aug 2013 13:19:02 -0700 Subject: [PATCH 4/4] rename missed variable in last commit --- jenkins/jobs.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index c0d5081d5c..ed33f49723 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -138,7 +138,7 @@ interfaceOSXJob.with { } } -queue interfaceAppleJob +queue interfaceOSXJob /* setup the parametrized build job for builds from jenkins */ parameterizedJob = hifiJob('$TARGET', true)