Merge pull request #866 from birarda/master

changes to jobs DSL for interface OS X build
This commit is contained in:
Leonardo Murillo 2013-08-19 13:19:38 -07:00
commit 16f8bb0cb4

View file

@ -10,9 +10,10 @@ def hifiJob(String targetName, Boolean deploy) {
scm { scm {
git(GIT_REPO_URL, 'master') { node -> git(GIT_REPO_URL, 'master') { node ->
node / includedRegions << "${targetName}/.*\nlibraries/.*" node << {
node / 'userRemoteConfigs' / 'hudson.plugins.git.UserRemoteConfig' / 'name' << '' includedRegions "${targetName}/.*\nlibraries/.*"
node / 'userRemoteConfigs' / 'hudson.plugins.git.UserRemoteConfig' / 'refspec' << '' useShallowClone true
}
} }
} }
@ -108,7 +109,6 @@ def targets = [
'pairing-server':true, 'pairing-server':true,
'space-server':true, 'space-server':true,
'voxel-server':true, 'voxel-server':true,
'interface':false,
] ]
/* setup all of the target jobs to use the above template */ /* setup all of the target jobs to use the above template */
@ -116,6 +116,30 @@ for (target in targets) {
queue hifiJob(target.key, target.value) queue hifiJob(target.key, target.value)
} }
/* setup the OS X interface builds */
interfaceOSXJob = hifiJob('interface', false)
interfaceOSXJob.with {
name 'hifi-interface-osx'
scm {
git(GIT_REPO_URL, 'stable') { node ->
node << {
includedRegions "interface/.*\nlibraries/.*"
useShallowClone true
}
}
}
configure { project ->
project << {
assignedNode 'interface-mini'
canRoam false
}
}
}
queue interfaceOSXJob
/* setup the parametrized build job for builds from jenkins */ /* setup the parametrized build job for builds from jenkins */
parameterizedJob = hifiJob('$TARGET', true) parameterizedJob = hifiJob('$TARGET', true)
parameterizedJob.with { parameterizedJob.with {
@ -128,7 +152,11 @@ parameterizedJob.with {
} }
scm { scm {
git('git@github.com:/$GITHUB_USER/hifi.git', '$GIT_BRANCH') { node -> git('git@github.com:/$GITHUB_USER/hifi.git', '$GIT_BRANCH') { node ->
node / 'wipeOutWorkspace' << true node << {
wipeOutWorkspace true
useShallowClone true
}
} }
} }
configure { project -> configure { project ->
@ -144,7 +172,11 @@ parameterizedJob.with {
doxygenJob = hifiJob('docs', false) doxygenJob = hifiJob('docs', false)
doxygenJob.with { doxygenJob.with {
scm { scm {
git(GIT_REPO_URL, 'master') {} git(GIT_REPO_URL, 'master') { node ->
node << {
useShallowClone true
}
}
} }
configure { project -> configure { project ->