Commit 5df20154 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/vhost: Move nvmf_vhost to vhost suite 



This test depends on additional qcow2 image which is by design
handled via vhost suite so it's better fit there. Also, since we have
various nvmf jobs, this test is unnecessarily run multiple times under
both, bare-metal, and virtual setups. Limit that to bare-metal, where
vhost suite is executed, and enforce TCP as a transport.

Change-Id: I15b8791e523c9077664d16f5c6c34235f023c883
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/18862


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
parent a1f35c64

test/nvmf/nvmf.sh

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ fi 


run_test "nvmf_host_management" $rootdir/test/nvmf/target/host_management.sh "${TEST_ARGS[@]}"

run_test "nvmf_lvol" $rootdir/test/nvmf/target/nvmf_lvol.sh "${TEST_ARGS[@]}"

run_test "nvmf_vhost" $rootdir/test/nvmf/target/nvmf_vhost.sh "${TEST_ARGS[@]}"

run_test "nvmf_bdev_io_wait" $rootdir/test/nvmf/target/bdev_io_wait.sh "${TEST_ARGS[@]}"

run_test "nvmf_queue_depth" $rootdir/test/nvmf/target/queue_depth.sh "${TEST_ARGS[@]}"

run_test "nvmf_multipath" $rootdir/test/nvmf/target/multipath.sh "${TEST_ARGS[@]}"

test/nvmf/target/nvmf_vhost.sh→test/vhost/nvmf/nvmf_vhost.sh

+9 −4
Original line number Diff line number Diff line
@@ -3,12 +3,17 @@ 
#  Copyright (C) 2019 Intel Corporation

#  All rights reserved.

#

testdir=$(readlink -f $(dirname $0))

testdir=$(readlink -f "$(dirname "$0")")

rootdir=$testdir/../../..

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/nvmf/common.sh



source $rootdir/test/vhost/common.sh

set -- "--transport=tcp" "--iso" "$@"



export NET_TYPE=phy-fallback



source "$rootdir/test/common/autotest_common.sh"

source "$rootdir/test/nvmf/common.sh"



source "$rootdir/test/vhost/common.sh"



MALLOC_BDEV_SIZE=128

MALLOC_BLOCK_SIZE=512

test/vhost/vhost.sh

+1 −0
Original line number Diff line number Diff line
@@ -73,3 +73,4 @@ run_test "vhost_blk_packed_ring_integrity" $WORKDIR/fiotest/fio.sh -x --fio-bin= 
	--packed



run_test "spdkcli_vhost" $rootdir/test/spdkcli/vhost.sh

run_test "nvmf_vhost" "$WORKDIR/nvmf/nvmf_vhost.sh"