From ac277af97d607ab1fd2b34636bbe7b07ef659f48 Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Tue, 13 Mar 2018 11:11:28 -0400 Subject: [PATCH] test/config: add install VPP in vm_setup.sh This patch adds compilation and installation of VPP. Note that it removes one of VPP config files, that is responsible for setting up hugepages. It is already done with setup.sh script. Parameters kernel.shmmax and vm.max_map_count were set to low count and causing issues with hugepage total sizes above 1GB. Change-Id: Ic6c31f4192c654672e36c4131e34eb5b8aaac022 Signed-off-by: Tomasz Zawadzki Reviewed-on: https://review.gerrithub.io/404144 Tested-by: SPDK Automated Test System Reviewed-by: Seth Howell Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- doc/iscsi.md | 10 ++++++++++ test/common/config/vm_setup.sh | 26 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/doc/iscsi.md b/doc/iscsi.md index 7a2cc8cf0..0ddfff5d3 100644 --- a/doc/iscsi.md +++ b/doc/iscsi.md @@ -241,6 +241,16 @@ Packages can be found in `vpp/build-root/` directory. For more in depth instructions please see Building section in [VPP documentation](https://wiki.fd.io/view/VPP/Pulling,_Building,_Running,_Hacking_and_Pushing_VPP_Code#Building) +*Please note: VPP 18.01.1 does not support OpenSSL 1.1. It is suggested to install a compatibility package +for compilation time.* +~~~ +sudo dnf install -y --allowerasing compat-openssl10-devel +~~~ +*Then reinstall latest OpenSSL devel package:* +~~~ +sudo dnf install -y --allowerasing openssl-devel +~~~ + ## 2. Installing VPP {#vpp_install} Packages can be installed from distribution repository or built in previous step. diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index a284b68ef..83c8f3213 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -155,6 +155,32 @@ make -j${jobs} sudo make install cd ~ +# Vector packet processing (VPP) is installed for use with iSCSI tests. +git clone https://gerrit.fd.io/r/vpp +cd vpp +git checkout v18.01.1 +# VPP 18.01.1 does not support OpenSSL 1.1. +# For compilation, a compatibility package is used temporarily. +sudo dnf install -y --allowerasing compat-openssl10-devel +# Installing required dependencies for building VPP +yes | make install-dep + +make pkg-rpm -j${jobs} +# Reinstall latest OpenSSL devel package. +sudo dnf install -y --allowerasing openssl-devel +cd build-root +sudo dnf install -y \ + ./vpp-lib-18.01.1-release.x86_64.rpm \ + ./vpp-devel-18.01.1-release.x86_64.rpm \ + ./vpp-18.01.1-release.x86_64.rpm +# Since hugepage configuration is done via spdk/scripts/setup.sh, +# this default config is not needed. +# +# NOTE: Parameters kernel.shmmax and vm.max_map_count are set to +# very low count and cause issues with hugepage total sizes above 1GB. +sudo rm -f /etc/sysctl.d/80-vpp.conf +cd ~ + # We currently don't make any changes to the libiscsi repository for our tests, but it is possible that we will need # to later. Cloning from git is just future proofing the machines. git clone https://github.com/sahlberg/libiscsi