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 47b563351b89c98976f09c3c7ba610d9a1651097..39a5d74288196addd1ac315add6987833324214c 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,23 +1,14 @@
 STREAMS:
-- clustering-netvirt-lithium:
-    branch: topic/lithium/net-virt-clustering
-    jdks: openjdk7
+- beryllium:
+    branch: master
+    jdks: openjdk7,openjdk8
+    autorelease: true
 - clustering-netvirt-master:
     branch: topic/master/net-virt-clustering
     jdks: openjdk7
-- neutron-yang-migration:
-    branch: topic/master/neutron-yang-migration
-    jdks: openjdk7
-- routermanager:
-    branch: topic/routermanager
-    jdks: openjdk7
 - pre-boron:
     branch: pre-boron
     jdks: openjdk7,openjdk8
-- beryllium:
-    branch: master
-    jdks: openjdk7,openjdk8
-    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
@@ -25,4 +16,4 @@ STREAMS:
     branch: stable/helium
     jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron
-JOB_TEMPLATES: verify,merge,daily,distribution,integration
+JOB_TEMPLATES: verify,merge,periodic,distribution,integration