Merge "Add stable/lithium jobs for openflowjava"

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/persistence/persistence.cfg b/jjb/persistence/persistence.cfg
index f2de91d9eabac063fffdecf92477f5b724bc4f5a..3edbc173e98c665d35de10903f1416fb42e4224c 100644 (file)
--- a/jjb/persistence/persistence.cfg
+++ b/jjb/persistence/persistence.cfg
@@ -1 +1,2 @@
 BRANCHES: master
+JDKS: openjdk7,openjdk8

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