Commit ac277af9 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Daniel Verkamp
Browse files

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: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-on: https://review.gerrithub.io/404144


Tested-by: default avatarSPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarSeth Howell <seth.howell5141@gmail.com>
Reviewed-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 64f9b729

doc/iscsi.md

+10 −0
Original line number Diff line number Diff line
@@ -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.

test/common/config/vm_setup.sh

+26 −0
Original line number Diff line number Diff line
@@ -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