X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Fprovision%2Fmininet-ovs-2.5.sh;h=4afb693411b92e81bfed2e27cd01cbd0dcb5d81e;hb=a49ba1366c3de6f2af722e5c35bb3cd468ce8638;hp=d90d4c8af77e070f1eac62dcef390a4fde5e22dc;hpb=45b87bbc0b38445ba45fd16556143e3ba1d4aaef;p=releng%2Fbuilder.git

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
index d90d4c8af..4afb69341 100644
--- a/packer/provision/mininet-ovs-2.5.sh
+++ b/packer/provision/mininet-ovs-2.5.sh
@@ -1,7 +1,10 @@
-#!/bin/bash
+#!/bin/bash -x
 
 # vim: sw=4 ts=4 sts=4 et tw=72 :
 
+# force any errors to cause the script and job to end in failure
+set -xeu -o pipefail
+
 # Ensure that necessary variables are set to enable noninteractive mode in
 # commands.
 export DEBIAN_FRONTEND=noninteractive
@@ -13,26 +16,31 @@ export DEBIAN_FRONTEND=noninteractive
 echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
 
 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.2'
-git clone git://github.com/mininet/mininet
-cd mininet
-git checkout -b 2.2.2 2.2.2
-cd ..
-mininet/util/install.sh -nf
-
-echo '---> Installing MT-Cbench'
-apt-get install -y --force-yes build-essential snmp libsnmp-dev snmpd libpcap-dev \
+apt-get update -m
+apt-get install openvswitch-switch openvswitch-vtep
+
+echo '---> Installing mininet'
+apt-get install mininet
+
+echo '---> Installing build pre-requisites'
+apt-get install 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
+apt-get install exabgp
+
+# Install vlan for vlan based tests in VTN suites
+apt-get install vlan
 
-echo '---> All Python package installation should happen in virtualenv'
-apt-get install -y --force-yes python-virtualenv python-pip
+# Install netaddr package which is needed by some custom mininet topologies
+apt-get install python-netaddr