Build Ubuntu 16.04 for mininet-ovs-2.5

- Use default version of mininet and openvswitch
- Add workaround for mtcbench build issue
  https://github.com/intracom-telecom-sdn/mtcbench/issues/10
- Enable Ubuntu1604 image only for mininet-ovs-2.5
- Enable Ubuntu1404 image only for mininet, mininet-ovs-2.3
- trello: https://trello.com/c/chIxf7ca

Change-Id: Ide927e10cd35f131a4507bb898ad5d4520843f07
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index ba0563ebe53bbf01a2884d39150621e03d9ace61..753fbbd023dee0c067394e777c67a7f556d48fc9 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -18,6 +18,7 @@
     platforms:
       - centos
       - ubuntu-14.04
+      - ubuntu-16.04
 
     templates:
       - devstack
@@ -52,6 +53,25 @@
         templates: devstack
       - platforms: ubuntu-14.04
         templates: docker
+      - platforms: ubuntu-16.04
+        templates: java-builder
+      - platforms: ubuntu-16.04
+        templates: robot
+      - platforms: ubuntu-16.04
+        templates: devstack-pre-pip-mitaka
+      - platforms: ubuntu-16.04
+        templates: devstack-pre-pip-newton
+      - platforms: ubuntu-16.04
+        templates: devstack
+      - platforms: ubuntu-16.04
+        templates: docker
+      - platforms: ubuntu-16.04
+        templates: mininet
+      - platforms: ubuntu-16.04
+        templates: mininet-ovs-2.3
+      - platforms: ubuntu-14.04
+        templates: mininet-ovs-2.5
+
 
     project-type: freestyle
     archive-artifacts: '**/*.log'

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
index a3d1e423df9957fec48b5f6d3c8974cb9b441a18..1702c8fe2cd5b015b1bf03bd748f8843bef43393 100644 (file)
--- a/packer/provision/mininet-ovs-2.5.sh
+++ b/packer/provision/mininet-ovs-2.5.sh
@@ -15,24 +15,27 @@ export DEBIAN_FRONTEND=noninteractive
 # ups
 echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
 
+# remove all force-yes with --allow*
 echo '---> Install OpenVSwitch 2.5.0'
-add-apt-repository -y ppa:sgauthier/openvswitch-dpdk
 apt-get update -y --force-yes
 apt-get install -y --force-yes openvswitch-switch openvswitch-vtep
 
-echo '---> Installing mininet 2.2.1'
-git clone git://github.com/mininet/mininet
-cd mininet
-git checkout -b 2.2.1 2.2.1
-cd ..
-mininet/util/install.sh -nf
+echo '---> Installing mininet'
+apt-get install -y --force-yes mininet
 
-echo '---> Installing MT-Cbench'
+echo '---> Installing build pre-requisites'
 apt-get install -y --force-yes build-essential snmp libsnmp-dev snmpd libpcap-dev \
 autoconf make automake libtool libconfig-dev libssl-dev libffi-dev libssl-doc pkg-config
+
 git clone https://github.com/intracom-telecom-sdn/mtcbench.git
-mtcbench/build_mtcbench.sh
-cp mtcbench/oflops/cbench/cbench /usr/local/bin/
+mtcbench/deploy/docker/provision.sh
+# TODO: remove workaround for build issue with mtcbench
+# when mtcbench dependency build correctly
+# https://github.com/intracom-telecom-sdn/mtcbench/issues/10
+mtcbench/build_mtcbench.sh || true
+cd mtcbench/oflops/cbench
+make
+cp cbench /usr/local/bin/
 
 echo '---> Installing exabgp'
 apt-get install -y --force-yes exabgp