Remove Quagga builds from packer images

[releng/builder.git] / packer / provision / mininet-ovs-2.5.sh

diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh
index 68999d83ded120afaf4cacb6b170f7dff97f4938..7cbab296ab9cee1c07585a76dd5797c42693b4e1 100644 (file)
--- a/packer/provision/mininet-ovs-2.5.sh
+++ b/packer/provision/mininet-ovs-2.5.sh
@@ -19,6 +19,12 @@ echo '---> Install OpenVSwitch 2.5.0'
 apt-get update -m
 apt-get install openvswitch-switch openvswitch-vtep
 
+# Temporary workaround required to bring up OVS
+# post-install without which OVS daemon exits.
+service openvswitch-switch restart
+# Verify the OVS service status
+service openvswitch-switch status
+
 echo '---> Installing mininet'
 apt-get install mininet
 
@@ -39,31 +45,8 @@ cp cbench /usr/local/bin/
 echo '---> Installing exabgp'
 apt-get install exabgp
 
-echo '---> All Python package installation should happen in virtualenv'
-apt-get install python-virtualenv python-pip
-
 # Install vlan for vlan based tests in VTN suites
 apt-get install vlan
 
 # Install netaddr package which is needed by some custom mininet topologies
 apt-get install python-netaddr
-
-#Check out 6Wind quagga with tag name '20170330', compile and install for router functionalities
-echo "---> Installing the 6Wind Quagga..."
-mkdir -p /tmp/build_quagga
-cd /tmp/build_quagga
-git clone https://github.com/6WIND/zrpcd.git
-cd zrpcd
-git checkout 20170330
-chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
-
-# On Ubuntu 16.04, the 6Wind Quagga top level build script needs to be enhanced to use
-# the right libboost version for this git check-in tag name '20170330'.
-sed -e 's/libboost1.55-all-dev/libboost1.58-all-dev/' \
-pkgsrc/dev_compile_script.sh > pkgsrc/dev_compile_ubuntu16.04_script.sh
-chmod a+x /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_ubuntu16.04_script.sh
-
-/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_ubuntu16.04_script.sh -d -b -t
-
-# Removing the build_quagga folder
-rm -rf /tmp/build_quagga/