From 920bb2b3c11e75d028573f9a09e5ed6dc732761e Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Tue, 21 May 2019 10:13:31 +0200 Subject: [PATCH] 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: Karol Latecki Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/455203 Tested-by: SPDK CI Jenkins Reviewed-by: Pawel Kaminski Reviewed-by: Ben Walker Reviewed-by: Darek Stojaczyk --- test/vhost/readonly/delete_partition_vm.sh | 3 --- test/vhost/readonly/disabled_readonly_vm.sh | 3 --- test/vhost/readonly/enabled_readonly_vm.sh | 3 --- test/vhost/vhost.sh | 12 ++++++------ 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/test/vhost/readonly/delete_partition_vm.sh b/test/vhost/readonly/delete_partition_vm.sh index 2873b78d4..0b579130e 100755 --- a/test/vhost/readonly/delete_partition_vm.sh +++ b/test/vhost/readonly/delete_partition_vm.sh @@ -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" diff --git a/test/vhost/readonly/disabled_readonly_vm.sh b/test/vhost/readonly/disabled_readonly_vm.sh index 85b6b5609..c6c47d619 100755 --- a/test/vhost/readonly/disabled_readonly_vm.sh +++ b/test/vhost/readonly/disabled_readonly_vm.sh @@ -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" diff --git a/test/vhost/readonly/enabled_readonly_vm.sh b/test/vhost/readonly/enabled_readonly_vm.sh index 3234f13a4..048a8d303 100755 --- a/test/vhost/readonly/enabled_readonly_vm.sh +++ b/test/vhost/readonly/enabled_readonly_vm.sh @@ -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" diff --git a/test/vhost/vhost.sh b/test/vhost/vhost.sh index 116bd232d..97c7d2a76 100755 --- a/test/vhost/vhost.sh +++ b/test/vhost/vhost.sh @@ -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