Merge "Changed VTN's jobs for Beryllium to use JDK8."

diff --git a/jjb/integration/include-raw-integration-install-robotframework.sh b/jjb/integration/include-raw-integration-install-robotframework.sh
index 1bdd74a0796c4832b7b6c78996a018cb4ae73d47..0614a6147fbe3ff93c0940a218ae9c14641f659f 100644 (file)
--- a/jjb/integration/include-raw-integration-install-robotframework.sh
+++ b/jjb/integration/include-raw-integration-install-robotframework.sh
@@ -15,7 +15,7 @@ echo ROBOT_VENV=${ROBOT_VENV} >> ${WORKSPACE}/env.properties
 
 virtualenv ${ROBOT_VENV}
 source ${ROBOT_VENV}/bin/activate
-pip install -q docker-py importlib requests scapy netaddr
+pip install -q docker-py importlib requests scapy netaddr ipaddr
 pip install -q robotframework{,-{httplibrary,requests,sshlibrary}}
 
 # vim: sw=4 ts=4 sts=4 et ft=sh :

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 800047c36eed0a50b261c330d02e6e53f9d6610a..3d5cc928acd19c52aa784d7a1cd7ce245ea6e60b 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1,9 +1,9 @@
 STREAMS:
-- clustering-lithium:
-    branch: topic/lithium/clustering
+- clustering-netvirt-lithium:
+    branch: topic/lithium/net-virt-clustering
     jdks: openjdk7
-- clustering-master:
-    branch: topic/master/clustering
+- clustering-netvirt-master:
+    branch: topic/master/net-virt-clustering
     jdks: openjdk7
 - neutron-yang-migration:
     branch: topic/master/neutron-yang-migration

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 855485fc03c48a47f2b1dd0f959ef4904690fdfe..a74cf3b3c9086a41f512dc7d013ea44004544cb6 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -17,13 +17,13 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - clustering-lithium:
-            branch: 'topic/lithium/clustering'
+        - clustering-netvirt-lithium:
+            branch: 'topic/lithium/net-virt-clustering'
             jdk: openjdk7
             jdks:
                 - openjdk7
-        - clustering-master:
-            branch: 'topic/master/clustering'
+        - clustering-netvirt-master:
+            branch: 'topic/master/net-virt-clustering'
             jdk: openjdk7
             jdks:
                 - openjdk7