Merge "Add odlsign-bulk script"

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

diff --git a/jjb/controller/controller.cfg b/jjb/controller/controller.cfg
index 236f40160afc1a50280c72e5e49f13bfd59543ac..426834047b9ad98c675a50d40c25e016a170f709 100644 (file)
--- a/jjb/controller/controller.cfg
+++ b/jjb/controller/controller.cfg
@@ -1,17 +1,16 @@
 STREAMS:
-- pre-boron:
-    branch: pre-boron
-    jdks: openjdk7,openjdk8
-- beryllium:
+- boron:
     branch: master
+    jdks: openjdk8
+    autorelease: true
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
     autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7,openjdk8
-- stable-helium:
-    branch: stable/helium
-    jdks: openjdk7
+    distribution-check: false
 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