From d511348a8ee2f6fe0d5563085298834a3dbe3c79 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Tue, 2 Feb 2021 11:48:13 +0100 Subject: [PATCH] pkgdep/git: Add support for installing ice driver Needed as depending on the kernel version given system is running under, some E800 controllers may not be supported. Signed-off-by: Michal Berger Change-Id: Ic3ac24e24c68d62fecd702170f0bccc7176da8cb Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6235 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Karol Latecki Reviewed-by: Monica Kenguva Reviewed-by: Jim Harris Reviewed-by: Tomasz Zawadzki --- test/common/config/pkgdep/git | 14 ++++++++++++++ test/common/config/vm_setup.sh | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/test/common/config/pkgdep/git b/test/common/config/pkgdep/git index 4e0d6c9b4..900d905e3 100644 --- a/test/common/config/pkgdep/git +++ b/test/common/config/pkgdep/git @@ -461,8 +461,19 @@ function install_irdma() { EOF } +function install_ice() { + rm -rf "$GIT_REPOS/ice-$ICE_VERSION" + + curl -L -o- "$ICE_DRIVER" | tar -C "$GIT_REPOS" -xzf - + ( + cd "$GIT_REPOS/ice-$ICE_VERSION/src" + make -j"$(nproc)" install + ) +} + GIT_VERSION=2.25.1 IRDMA_VERSION=1.2.21 +ICE_VERSION=1.2.1 : ${GIT_REPO_SPDK=https://github.com/spdk/spdk.git} export GIT_REPO_SPDK : ${GIT_REPO_DPDK=https://github.com/spdk/dpdk.git} @@ -487,6 +498,8 @@ export GIT_REPO_GIT export GIT_REPO_DPDK_KMODS : ${IRDMA_DRIVER=https://downloadmirror.intel.com/29751/eng/irdma-$IRDMA_VERSION.tgz} export IRDMA_DRIVER +: ${ICE_DRIVER=https://downloadmirror.intel.com/29746/eng/ice-$ICE_VERSION.tar.gz} +export ICE_DRIVER GIT_REPOS=${GIT_REPOS:-$HOME} gcc_version=$(gcc -dumpversion) gcc_version=${gcc_version%%.*} @@ -513,6 +526,7 @@ else install_flamegraph install_qemu install_igb_uio + install_ice ) install_extra_pkgs fi diff --git a/test/common/config/vm_setup.sh b/test/common/config/vm_setup.sh index b67d4172d..b44f495c2 100755 --- a/test/common/config/vm_setup.sh +++ b/test/common/config/vm_setup.sh @@ -29,7 +29,7 @@ VM_SETUP_PATH=$(readlink -f ${BASH_SOURCE%/*}) UPGRADE=false INSTALL=false -CONF="rocksdb,fio,flamegraph,tsocks,qemu,libiscsi,nvmecli,qat,spdk,refspdk,vagrant,igb_uio" +CONF="rocksdb,fio,flamegraph,tsocks,qemu,libiscsi,nvmecli,qat,spdk,refspdk,vagrant,igb_uio,ice" package_manager= function pre_install() { :; }