X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=packer%2Fprovision%2Fmininet.sh;h=0e7efcb37dfa7b1f8155222705f73a31ebdca1b6;hb=a749c9fa8ab5aa92f141a458137478b980c9ac69;hp=2bafedfacc4182f78d4e2308cfcf574034af0b41;hpb=92be8239cf3dbd22807afacc841021a733283bb6;p=releng%2Fbuilder.git

diff --git a/packer/provision/mininet.sh b/packer/provision/mininet.sh
index 2bafedfac..0e7efcb37 100644
--- a/packer/provision/mininet.sh
+++ b/packer/provision/mininet.sh
@@ -2,6 +2,9 @@
 
 # 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
@@ -48,40 +51,11 @@ git apply -p0 < ../newOptions.patch
 cd ./util
 ./install.sh -nfv
 
-echo '---> Install CPqD and dependencies'
-apt-get install -y --force-yes -qq build-essential cmake flex
-apt-get install -y --force-yes -qq libpcre++-dev libxerces-c-dev libpcap-dev libboost-all-dev
-
-cd /tmp
-wget -nc http://de.archive.ubuntu.com/ubuntu/pool/main/b/bison/bison_2.5.dfsg-2.1_amd64.deb \
-         http://de.archive.ubuntu.com/ubuntu/pool/main/b/bison/libbison-dev_2.5.dfsg-2.1_amd64.deb
-
-dpkg -i bison_2.5.dfsg-2.1_amd64.deb libbison-dev_2.5.dfsg-2.1_amd64.deb
-rm bison_2.5.dfsg-2.1_amd64.deb libbison-dev_2.5.dfsg-2.1_amd64.deb
-
-wget -nc http://www.nbee.org/download/nbeesrc-jan-10-2013.zip
-unzip nbeesrc-jan-10-2013.zip
-cd nbeesrc-jan-10-2013/src
-cmake .
-make
-cp ../bin/libn*.so /usr/local/lib
-ldconfig
-cp -R ../include/* /usr/include/
-cd ../..
-
-git clone https://github.com/CPqD/ofsoftswitch13.git
-cd ofsoftswitch13
-./boot.sh
-./configure
-make
-make install
-cd ..
-
 echo '---> Installing cbench installation for running openflow performance tests'
 OF_DIR=$HOME/openflow  # Directory that contains OpenFlow code
 OFLOPS_DIR=$HOME/oflops  # Directory that contains oflops repo
 
-apt-get install -y --force-yes -qq libsnmp-dev libpcap-dev libconfig-dev
+apt-get install -y --force-yes libsnmp-dev libpcap-dev libconfig-dev
 
 git clone git://gitosis.stanford.edu/openflow.git $OF_DIR
 git clone https://github.com/andi-bigswitch/oflops.git $OFLOPS_DIR
@@ -93,4 +67,10 @@ make
 make install
 
 echo '---> Installing vlan for vlan based tests in VTN suites'
-apt-get install -y --force-yes -qq vlan
+apt-get install -y --force-yes 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 -y --force-yes -qq python-netaddr