Fix spectrometer-merge job to only run on merges

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

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 800047c36eed0a50b261c330d02e6e53f9d6610a..6b17ca377b0d0a96bed20032147b872f7022e028 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,24 +1,15 @@
 STREAMS:
-- clustering-lithium:
-    branch: topic/lithium/clustering
-    jdks: openjdk7
-- clustering-master:
-    branch: topic/master/clustering
-    jdks: openjdk7
-- neutron-yang-migration:
-    branch: topic/master/neutron-yang-migration
-    jdks: openjdk7
-- routermanager:
-    branch: topic/routermanager
-    jdks: openjdk7
-- beryllium:
+- boron:
     branch: master
-    jdks: openjdk7
+    jdks: openjdk8
+    autorelease: true
+- 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