From 2373c83bf7d60cae6d248d13a612d182641393c6 Mon Sep 17 00:00:00 2001 From: "rahul.agarwal" Date: Tue, 28 Mar 2017 22:42:07 +0530 Subject: [PATCH] Add 6Wind quagga to ubuntu16.04 and centos7 images 6Wind Quagga router is Open Sourced and can be compiled in two modes (namely 'l3vpn mode' and 'evpn mode) resulting in separate binaries required to be installed on minion images. Both binaries are required for Boron & Carbon DC-Gateway testing. L3VPN Quagga binary is needed for Boron and EVPN Quagga binary is required for Carbon testing. - https://lists.opendaylight.org/pipermail/integration-dev/ 2017-March/009376.html Change-Id: Ibfe5b941ea2f31731ad10fbafa54daeb66f18878 Signed-off-by: rahul.agarwal Signed-off-by: Anil Belur --- packer/provision/java-builder.sh | 12 ++++++++++++ packer/provision/mininet-ovs-2.5.sh | 20 ++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/packer/provision/java-builder.sh b/packer/provision/java-builder.sh index 9f3da56ef..6ef6dd271 100644 --- a/packer/provision/java-builder.sh +++ b/packer/provision/java-builder.sh @@ -73,3 +73,15 @@ unzip packer_0.12.2_linux_amd64.zip -d /usr/local/bin/ # rename packer to avoid conflict with binary in cracklib mv /usr/local/bin/packer /usr/local/bin/packer.io +#Check out 6Wind quagga with tag name '20170330', compile and install for router functionalities +echo "Installing the 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 +/tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t + +# Removing the build_quagga folder +rm -rf /tmp/build_quagga/ \ No newline at end of file diff --git a/packer/provision/mininet-ovs-2.5.sh b/packer/provision/mininet-ovs-2.5.sh index 5f392cf8a..171a764a3 100644 --- a/packer/provision/mininet-ovs-2.5.sh +++ b/packer/provision/mininet-ovs-2.5.sh @@ -47,3 +47,23 @@ 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/ \ No newline at end of file -- 2.36.6