From cfe089b2ffb787a78befd5aa9ae7a844daccc17b Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 19 Jun 2013 14:12:47 -0700 Subject: [PATCH 1/5] add name and refspec to scm node for push trigger --- jenkins/jobs.groovy | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 8dd6df5aea..ad74ab85a0 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -1,6 +1,7 @@ def hifiJob(String targetName, Boolean deploy) { def JENKINS_URL = 'https://jenkins.below92.com/' def GITHUB_HOOK_URL = 'https://github.com/worklist/hifi/' + def GIT_REPO_URL = 'git@github.com:worklist/hifi.git' def HIPCHAT_ROOM = 'High Fidelity' job { @@ -8,8 +9,10 @@ def hifiJob(String targetName, Boolean deploy) { logRotator(7, -1, -1, -1) scm { - git(GITHUB_HOOK_URL, 'master') { node -> - node << includedRegions << "${targetName}/.*\nlibraries/.*" + git(GIT_REPO_URL, 'master') { node -> + node / includedRegions << "${targetName}/.*\nlibraries/.*" + node / 'userRemoteConfigs' / 'hudson.plugins.git.UserRemoteConfig' / 'name' << '' + node / 'userRemoteConfigs' / 'hudson.plugins.git.UserRemoteConfig' / 'refspec' << '' } } From 1ad6af8b8d2abc80abe21a278b65467b0499d3dd Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 19 Jun 2013 14:34:22 -0700 Subject: [PATCH 2/5] bunch interface in a map with other targets, queue added jobs --- jenkins/jobs.groovy | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index ad74ab85a0..08dcbc5e3e 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -92,25 +92,23 @@ def hifiJob(String targetName, Boolean deploy) { } } -def deployTargets = [ - 'animation-server', - 'audio-mixer', - 'avatar-mixer', - 'domain-server', - 'eve', - 'pairing-server', - 'space-server', - 'voxel-server' +def targets = [ + 'animation-server':true, + 'audio-mixer':true, + 'avatar-mixer':true, + 'domain-server':true, + 'eve':true, + 'pairing-server':true, + 'space-server':true, + 'voxel-server':true, + 'interface':false ] -/* setup all of the deploys jobs that use the above template */ -deployTargets.each { - hifiJob(it, true) +/* setup all of the target jobs to use the above template */ +for (target in targets) { + queue hifiJob(target, target.value) } -/* setup the interface job, doesn't deploy */ -hifiJob('interface', false) - /* setup the parametrized-build job for builds from jenkins */ parameterizedJob = hifiJob('$TARGET', true) parameterizedJob.with { From 410614296da38016977745e36ded15dde8ff520a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 19 Jun 2013 14:45:37 -0700 Subject: [PATCH 3/5] fix reference to groovy map target key --- jenkins/jobs.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index 08dcbc5e3e..f003b3bff5 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -106,7 +106,7 @@ def targets = [ /* setup all of the target jobs to use the above template */ for (target in targets) { - queue hifiJob(target, target.value) + queue hifiJob(target.key, target.value) } /* setup the parametrized-build job for builds from jenkins */ From d9da29efada8a81c3bd08848bdc1c658533b2696 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 19 Jun 2013 14:47:45 -0700 Subject: [PATCH 4/5] add copyright to OctalCode implementation --- libraries/shared/src/OctalCode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/shared/src/OctalCode.cpp b/libraries/shared/src/OctalCode.cpp index d51f058459..e9eaa1c49a 100644 --- a/libraries/shared/src/OctalCode.cpp +++ b/libraries/shared/src/OctalCode.cpp @@ -3,7 +3,7 @@ // hifi // // Created by Stephen Birarda on 3/15/13. -// +// Copyright (c) 2013 HighFidelity, Inc. All rights reserved. // #include From 330d3e82830734ffcbed6c0d202ed05f58d9b5ee Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 19 Jun 2013 14:48:50 -0700 Subject: [PATCH 5/5] add a dummy job for queue test --- jenkins/jobs.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins/jobs.groovy b/jenkins/jobs.groovy index f003b3bff5..2788ecc903 100644 --- a/jenkins/jobs.groovy +++ b/jenkins/jobs.groovy @@ -101,7 +101,8 @@ def targets = [ 'pairing-server':true, 'space-server':true, 'voxel-server':true, - 'interface':false + 'interface':false, + 'dummy-job':false ] /* setup all of the target jobs to use the above template */