Merge "Update automated project templates"

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 8b9abc7108f11cf9cdb10595e0062c5809aefac3..b6f2f891648d3b496bf074288b0e1a9ad001127d 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,2 +1,9 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin,neutron
-JOB_TEMPLATES: verify,merge,daily,integration
\ No newline at end of file
+JOB_TEMPLATES: verify,merge,daily,integration

diff --git a/jjb/packetcable/packetcable.cfg b/jjb/packetcable/packetcable.cfg
index dc50acd7ce18c031d977fa5c8c10d3cb4bd40cd2..acc9d69890bec5d8be6ed2de1fa1c76f5f5a9b7f 100644 (file)
--- a/jjb/packetcable/packetcable.cfg
+++ b/jjb/packetcable/packetcable.cfg
@@ -1 +1,8 @@
-DEPENDENCIES: controller,yangtools
\ No newline at end of file
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
+DEPENDENCIES: controller,yangtools

diff --git a/jjb/sfc/sfc.cfg b/jjb/sfc/sfc.cfg
index 233383f576d95af038bedce25cb6943656c34595..a1b5f4c1a5da704cab1ab86032bcd91dc0db8b8d 100644 (file)
--- a/jjb/sfc/sfc.cfg
+++ b/jjb/sfc/sfc.cfg
@@ -1,2 +1,9 @@
+BRANCHES:
+- master:
+    jdks: openjdk7
+- stable/helium:
+    jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: odlparent,yangtools,controller,openflowplugin,ovsdb,lispflowmapping

diff --git a/jjb/tsdr/tsdr.cfg b/jjb/tsdr/tsdr.cfg
index c31267c8bcc1bb90ed4363108fc61692f939186b..ca41d539926e1750067612345148dd0f791dc702 100644 (file)
--- a/jjb/tsdr/tsdr.cfg
+++ b/jjb/tsdr/tsdr.cfg
@@ -1,5 +1,7 @@
 BRANCHES:
 - master:
     jdks: openjdk7
+- stable/lithium:
+    jdks: openjdk7
 MVN_GOALS: clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m