Merge "BUG-2625: validate OFP using jdk8 only"

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

diff --git a/jjb/vtn/vtn.cfg b/jjb/vtn/vtn.cfg
index 7eaa89be0bb2d49b107a2b0f72a91bc7c8bd5731..72df9f84b1b11a345ee78b8776db832d57bc3160 100644 (file)
--- a/jjb/vtn/vtn.cfg
+++ b/jjb/vtn/vtn.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
 - stable-lithium:
@@ -12,6 +13,6 @@ STREAMS:
 - stable-helium:
     branch: stable/helium
     jdks: openjdk7
-DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,ovsdb,neutron
+DEPENDENCIES: controller,mdsal,neutron,odlparent,openflowplugin,ovsdb,yangtools
 MVN_GOALS: clean install -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2 -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-ARCHIVE_ARTIFACTS: manager/dist/*/target/*.zip, coordinator/dist/target/*.bz2, manager/northbound/target/site/wsdocs/**, manager/api/target/*-javadoc.jar, manager/api/target/apidocs/**, manager/target/*-javadoc.jar, manager/target/apidocs/**, manager/model/target/site/models/**
+ARCHIVE_ARTIFACTS: manager/dist/*/target/*.zip, coordinator/dist/target/*.bz2, manager/northbound/target/site/wsdocs/**, manager/api/target/*-javadoc.jar, manager/api/target/apidocs/**, target/*-javadoc.jar, target/apidocs/**, manager/model/target/site/models/**