Merge "Fix Java related issues"

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

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 3eb97ef2df508ec52d8187b80f9c20b9fcfdbaee..6b17ca377b0d0a96bed20032147b872f7022e028 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,22 +1,15 @@
 STREAMS:
-- beryllium:
+- boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
-- clustering-netvirt-master:
-    branch: topic/master/net-virt-clustering
-    jdks: openjdk7
-- routermanager:
-    branch: topic/routermanager
-    jdks: openjdk7
-- pre-boron:
-    branch: pre-boron
+- beryllium:
+    branch: stable/beryllium
     jdks: openjdk7,openjdk8
+    autorelease: true
 - stable-lithium:
     branch: stable/lithium
     jdks: openjdk7
-- stable-helium:
-    branch: stable/helium
-    jdks: openjdk7
+    distribution-check: false
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron
-JOB_TEMPLATES: verify,merge,daily,distribution,integration
+JOB_TEMPLATES: verify,merge,periodic,distribution,integration