Bug 3122: Allow JDKs to be enabled per branch in auto-jjb scripts

[releng/builder.git] / jjb / controller / controller.cfg

diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg
index b2e2fbf40c51b9daa5bca576cd5da6ff1fe3409f..66124c945e633aa083403691a5b32f774d7cd268 100644 (file)
--- a/jjb/controller/controller.cfg
+++ b/jjb/controller/controller.cfg
@@ -1,5 +1,11 @@
 JOB_TEMPLATES: merge,daily,integration,sonar
-BRANCHES: master,stable/helium,stable/lithium
+BRANCHES:
+- master:
+    jdks: openjdk7,openjdk8
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7,openjdk8
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs
 MVN_OPTS: -Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true
 DEPENDENCIES: yangtools,aaa