Commit 99850ca7 authored by Seth Howell's avatar Seth Howell Committed by Jim Harris
Browse files

vm_setup: add nvme-cli repo 



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

Change-Id: I51aab2050e1921aac899970e7abd3f1cd64836ba
Signed-off-by: default avatarSeth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/425642


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: default avatarZiye Yang <optimistyzy@gmail.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 85ba6069

test/common/config/vm_setup.conf

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

test/common/config/vm_setup.sh

+11 −2
Original line number Diff line number Diff line
@@ -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