Merge "Rework the way Java version is set in CSIT jobs"

diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml
index 5b9377caf8f72163f3a1fe927fa48a83a12a6fd1..d6117c035f03f517ae2fbffa38a4482e3a3b5196 100644 (file)
--- a/jjb/unimgr/unimgr-csit-basic.yaml
+++ b/jjb/unimgr/unimgr-csit-basic.yaml
@@ -25,8 +25,11 @@
         - all:
             scope: 'all'
 
+    # Mininet configuration
+    mininet-vms: 2
+
     # Features to install
-    install-features: 'odl-unimgr'
+    install-features: 'odl-unimgr-ui'
 
     # Robot custom options
     robot-options: ''

diff --git a/vagrant/ubuntu-mininet-ovs-2.3/bootstrap.sh b/vagrant/ubuntu-mininet-ovs-2.3/bootstrap.sh
index 2003384b3d9128d953e6a9efd39cec9ceb1a7574..6e0fc75819aab66fff8995eb01d32170c0b73ac8 100644 (file)
--- a/vagrant/ubuntu-mininet-ovs-2.3/bootstrap.sh
+++ b/vagrant/ubuntu-mininet-ovs-2.3/bootstrap.sh
@@ -69,3 +69,7 @@ cd $OFLOPS_DIR
 ./configure --with-openflow-src-dir=$OF_DIR
 make
 make install
+
+# Installing exabgp
+apt-get install -y --force-yes -qq exabgp
+