ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vm_setup: add nvme-cli repo

Browse Source 
The custom nvme-cli code is used in both the NVMe and NVMe-oF tests.

Change-Id: I51aab2050e1921aac899970e7abd3f1cd64836ba
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/425642
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ziye Yang <optimistyzy@gmail.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2018-09-14 12:59:09 -07:00 committed by Jim Harris
parent 85ba606943
commit 99850ca7d5
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,3 +8,4 @@ GIT_REPO_FLAMEGRAPH=https://github.com/brendangregg/FlameGraph.git
GIT_REPO_QEMU=https://github.com/spdk/qemu
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

13
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"
CONF="librxe,iscsi,rocksdb,fio,flamegraph,tsocks,qemu,vpp,libiscsi,nvmecli"
CONF_PATH="${VM_SETUP_PATH}/vm_setup.conf"
function usage()
@ -336,6 +336,14 @@ if echo $CONF | grep -q vpp; then
fi
fi
if echo $CONF | grep -q nvmecli; then
if [ ! -d nvme-cli ]; then
git clone "${GIT_REPO_SPDK_NVME_CLI}"
else
echo "nvme-cli already checked out. Skipping"
fi
fi
if echo $CONF | grep -q libiscsi; then
# 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.
@ -367,8 +375,9 @@ SPDK_RUN_VALGRIND=1
SPDK_TEST_UNITTEST=1
SPDK_TEST_ISCSI=1
SPDK_TEST_ISCSI_INITIATOR=1
# nvme and nvme-cli cannot be run at the same time on a VM.
SPDK_TEST_NVME=1
SPDK_TEST_NVME_CLI=1
SPDK_TEST_NVME_CLI=0
SPDK_TEST_NVMF=1
SPDK_TEST_RBD=1
# requires some extra configuration. see TEST_ENV_SETUP_README