Merge "Make apt-get upgrade non-interactive for configuration"

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

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index b6f2f891648d3b496bf074288b0e1a9ad001127d..39a5d74288196addd1ac315add6987833324214c 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,9 +1,19 @@
-BRANCHES:
-- master:
+STREAMS:
+- beryllium:
+    branch: master
+    jdks: openjdk7,openjdk8
+    autorelease: true
+- clustering-netvirt-master:
+    branch: topic/master/net-virt-clustering
     jdks: openjdk7
-- stable/helium:
+- pre-boron:
+    branch: pre-boron
+    jdks: openjdk7,openjdk8
+- stable-lithium:
+    branch: stable/lithium
     jdks: openjdk7
-- stable/lithium:
+- stable-helium:
+    branch: stable/helium
     jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron
-JOB_TEMPLATES: verify,merge,daily,integration
+JOB_TEMPLATES: verify,merge,periodic,distribution,integration