Merge "Update automated project templates"

diff --git a/jenkins-scripts/robot.sh b/jenkins-scripts/robot.sh
index b292e9ea998ecf77956a40879a5a5723bd8ca57f..af2f5fd46e5f6d4f2808e6d04b6574b5287c37b8 100755 (executable)
--- a/jenkins-scripts/robot.sh
+++ b/jenkins-scripts/robot.sh
@@ -4,6 +4,13 @@ yum clean all
 yum install -y -q unzip python-netaddr @development
 yum remove -y robotframework-{sshlibrary,requests}
 
+## install Latest Robot Framewrok from source
+cd /tmp
+wget https://pypi.python.org/packages/source/r/robotframework/robotframework-2.9a1.tar.gz > /dev/null 2>&1
+tar -xvf robotframework-2.9a1.tar.gz > /dev/null 2>&1
+cd robotframework-2.9a1
+python setup.py install > /dev/null 2>&1
+
 ## install Latest Robot SSHLibrary from source
 cd /tmp
 wget http://pypi.python.org/packages/source/r/robotframework-sshlibrary/robotframework-sshlibrary-2.1.1.tar.gz > /dev/null 2>&1

diff --git a/jjb/l2switch/l2switch.cfg b/jjb/l2switch/l2switch.cfg
index c75a4cb54a8081843f07d7a571dadd1990a5cb13..c6f6758c44246552c8ece37269b1d2914ef2f4d4 100644 (file)
--- a/jjb/l2switch/l2switch.cfg
+++ b/jjb/l2switch/l2switch.cfg
@@ -1,3 +1,4 @@
+BRANCHES: master,stable/helium,stable/lithium
 MVN_GOALS: -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install
 MVN_OPTS: -Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true
 DEPENDENCIES: yangtools,controller,openflowjava,openflowplugin

diff --git a/jjb/openflowjava/openflowjava.cfg b/jjb/openflowjava/openflowjava.cfg
index f6a2c9ca42aabf9a087b3bcf7854dbfa73c686a4..6de0c932c51102dacce225a7b1a380cafcfc054c 100644 (file)
--- a/jjb/openflowjava/openflowjava.cfg
+++ b/jjb/openflowjava/openflowjava.cfg
@@ -1,2 +1,3 @@
+BRANCHES: master,stable/helium,stable/lithium
 DEPENDENCIES: yangtools,controller
 JDKS: openjdk7,openjdk8

diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg
index f2de91d9eabac063fffdecf92477f5b724bc4f5a..daff9db14486b05fa75be6049c5e710fb073450d 100644 (file)
--- a/jjb/snmp/snmp.cfg
+++ b/jjb/snmp/snmp.cfg
@@ -1 +1 @@
-BRANCHES: master
+BRANCHES: master,stable/lithium

diff --git a/jjb/topoprocessing/topoprocessing.cfg b/jjb/topoprocessing/topoprocessing.cfg
index 95cfec008f06717bcf9e65f8d582d90c71437a08..83c4ec70edc98047756db84641c6d370e57f3d93 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.cfg
+++ b/jjb/topoprocessing/topoprocessing.cfg
@@ -1,2 +1,2 @@
-BRANCHES: master
-DEPENDENCIES: controller,yangtools
\ No newline at end of file
+BRANCHES: master,stable/lithium
+DEPENDENCIES: controller,yangtools