Fix spectrometer-merge job to only run on merges

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

diff --git a/jjb/mdsal/mdsal.cfg b/jjb/mdsal/mdsal.cfg
index 28ff7d0c5d8890dd8b74d12bfc5356f4712ff765..cf46c9befafda6df8084008a6632c183e4552335 100644 (file)
--- a/jjb/mdsal/mdsal.cfg
+++ b/jjb/mdsal/mdsal.cfg
@@ -1,9 +1,10 @@
 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
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dmaven.compile.fork=true clean install -Dintegrationtests