d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/scripts: remove OCF from vm_setup script

Browse Source 
Since we have OCF as a submodule, we do not need to
install it separately.
vm_setup.sh was used to install dependencies for testing SPDK,
so remove all references to OCF in the vm_setup.sh.

This is related to issue #1279

Change-Id: I616dd6e72101c78c6902603ef077eb7992809ab9
Signed-off-by: Vitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1496
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
This commit is contained in:
Vitaliy Mysak 2020-03-26 16:04:00 +01:00 committed by Tomasz Zawadzki
parent 6fa52a2b3e
commit d713b99c3a
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/common/config/vm_setup.conf
View File

@ -11,4 +11,3 @@ GIT_REPO_VPP=https://gerrit.fd.io/r/vpp
GIT_REPO_LIBISCSI=https://github.com/sahlberg/libiscsi
GIT_REPO_SPDK_NVME_CLI=https://github.com/spdk/nvme-cli
DRIVER_LOCATION_QAT=https://01.org/sites/default/files/downloads/intelr-quickassist-technology/qat1.7.l.4.3.0-00033.tar.gz
GIT_REPO_CAS=https://github.com/Open-CAS/ocf

19
test/common/config/vm_setup.sh
View File

@ -24,7 +24,7 @@ VM_SETUP_PATH=$(readlink -f ${BASH_SOURCE%/*})
UPGRADE=false
INSTALL=false
CONF="librxe,iscsi,rocksdb,fio,flamegraph,tsocks,qemu,vpp,libiscsi,nvmecli,qat,ocf"
CONF="librxe,iscsi,rocksdb,fio,flamegraph,tsocks,qemu,vpp,libiscsi,nvmecli,qat"
LIBRXE_INSTALL=true
OSID=$(source /etc/os-release && echo $ID)
@ -312,20 +312,6 @@ function install_libiscsi()
fi
}
function install_ocf()
{
local version="v18.12"
local targetdir="/usr/src/ocf"
if echo $CONF | grep -q ocf; then
if [ ! -d "$targetdir" ]; then
sudo -E git clone "${GIT_REPO_OCF}" "$targetdir" -b "$version"
else
echo "OCF already installed. Skipping"
fi
fi
}
function install_git() {
sudo yum install -y zlib-devel curl-devel
tar -xzof <(wget -qO- "$GIT_REPO_GIT")
@ -416,7 +402,6 @@ GIT_VERSION=2.25.1
: ${GIT_REPO_SPDK_NVME_CLI=https://github.com/spdk/nvme-cli}; export GIT_REPO_SPDK_NVME_CLI
: ${GIT_REPO_INTEL_IPSEC_MB=https://github.com/spdk/intel-ipsec-mb.git}; export GIT_REPO_INTEL_IPSEC_MB
: ${DRIVER_LOCATION_QAT=https://01.org/sites/default/files/downloads//qat1.7.l.4.9.0-00008.tar.gz}; export DRIVER_LOCATION_QAT
: ${GIT_REPO_OCF=https://github.com/Open-CAS/ocf}; export GIT_REPO_OCF
: ${GIT_REPO_GIT=https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz}; export GIT_REPO_GIT
jobs=$(($(nproc)*2))
@ -699,7 +684,6 @@ install_vpp&
install_nvmecli&
install_libiscsi&
install_qat&
install_ocf&
wait
# create autorun-spdk.conf in home folder. This is sourced by the autotest_common.sh file.
@ -727,7 +711,6 @@ SPDK_TEST_BLOBFS=1
SPDK_TEST_PMDK=1
SPDK_TEST_LVOL=1
SPDK_TEST_JSON=1
SPDK_TEST_OCF=1
SPDK_RUN_ASAN=1
SPDK_RUN_UBSAN=1
# doesn't work on vm