Commit 920bb2b3 authored by Karol Latecki's avatar Karol Latecki Committed by Darek Stojaczyk
Browse files

test/vhost: re-enable readonly in nightly testing 



Tests for checking read-only option no longer fail.
Removing rootdir variable and sourcing commands as
*_vm.sh scripts are designed to be run as standalone
inside spawned VMs.

Change-Id: I491ebf8e2b305539e3fabdc6219ea53693ad2883
Signed-off-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455203


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 60d48787

test/vhost/readonly/delete_partition_vm.sh

+0 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 
set -xe



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

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/vhost/common.sh



disk_name="vda"

test_folder_name="readonly_test"

test/vhost/readonly/disabled_readonly_vm.sh

+0 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 
set -xe



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

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/vhost/common.sh



disk_name="vda"

test_folder_name="readonly_test"

test/vhost/readonly/enabled_readonly_vm.sh

+0 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 
set -x



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

rootdir=$(readlink -f $testdir/../../..)

source $rootdir/test/common/autotest_common.sh

source $rootdir/test/vhost/common.sh



disk_name="vda"

test_folder_name="readonly_test"

test/vhost/vhost.sh

+6 −6
Original line number Diff line number Diff line
@@ -112,6 +112,12 @@ if [ $RUN_NIGHTLY -eq 1 ]; then 
	run_test case $WORKDIR/lvol/lvol_test.sh --fio-bin=$FIO_BIN \

	--ctrl-type=spdk_vhost_blk --max-disks=1

	timing_exit integrity_lvol_blk_nightly



	timing_enter readonly

	echo 'Running readonly tests suite...'

	run_test case $WORKDIR/readonly/readonly.sh --vm_image=$VM_IMAGE --disk=Nvme0n1 -x

	report_test_completion "vhost_readonly"

	timing_exit readonly

fi



if [ $RUN_NIGHTLY_FAILING -eq 1 ]; then
@@ -120,12 +126,6 @@ if [ $RUN_NIGHTLY_FAILING -eq 1 ]; then 
	run_test case $WORKDIR/migration/migration.sh -x \

	--fio-bin=$FIO_BIN --os=$VM_IMAGE --test-cases=1,2

	timing_exit vhost_migration



	timing_enter readonly

	echo 'Running readonly tests suite...'

	run_test case $WORKDIR/readonly/readonly.sh --vm_image=$VM_IMAGE --disk=Nvme0n1 -x

	report_test_completion "vhost_readonly"

	timing_exit readonly

fi



timing_enter integrity_lvol_scsi