Commit cac68eec authored by Kamil Godzwon's avatar Kamil Godzwon Committed by Ben Walker
Browse files

autotest: reduce RAID tests runs 



To reduce the number of RAID test executions, keep
all of them under SPDK_TEST_RAID flag (bdev raid,
spdkcli raid and raid5f)

Use SPDK_TEST_RAID to set proper config params
for raid5f tests (--with-raid5f)

Signed-off-by: default avatarKamil Godzwon <kamilx.godzwon@intel.com>
Change-Id: I5349473db2dc14c4699f124a5f76525352477780
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/24292


Reviewed-by: default avatarKrzysztof Karas <krzysztof.karas@intel.com>
Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz@tzawadzki.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
parent 70425709

autotest.sh

+6 −8
Original line number Diff line number Diff line
@@ -191,7 +191,6 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 


	if [ $SPDK_TEST_BLOCKDEV -eq 1 ]; then

		run_test "blockdev_general" $rootdir/test/bdev/blockdev.sh

		run_test "bdev_raid" $rootdir/test/bdev/bdev_raid.sh

		run_test "bdevperf_config" $rootdir/test/bdev/bdevperf/test_config.sh

		if [[ $(uname -s) == Linux ]]; then

			run_test "reactor_set_interrupt" $rootdir/test/interrupt/reactor_set_interrupt.sh
@@ -199,6 +198,12 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
		fi

	fi



	if [[ $SPDK_TEST_RAID -eq 1 ]]; then

		run_test "bdev_raid" $rootdir/test/bdev/bdev_raid.sh

		run_test "spdkcli_raid" $rootdir/test/spdkcli/raid.sh

		run_test "blockdev_raid5f" $rootdir/test/bdev/blockdev.sh "raid5f"

	fi



	if [[ $(uname -s) == Linux ]]; then

		if [[ $SPDK_TEST_BLOCKDEV -eq 1 || $SPDK_TEST_URING -eq 1 ]]; then

			# The crypto job also includes the SPDK_TEST_BLOCKDEV in its configuration hence the
@@ -266,9 +271,6 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
	if [ $SPDK_TEST_ISCSI -eq 1 ]; then

		run_test "iscsi_tgt" $rootdir/test/iscsi_tgt/iscsi_tgt.sh

		run_test "spdkcli_iscsi" $rootdir/test/spdkcli/iscsi.sh



		# Run raid spdkcli test under iSCSI since blockdev tests run on systems that can't run spdkcli yet

		run_test "spdkcli_raid" $rootdir/test/spdkcli/raid.sh

	fi



	if [ $SPDK_TEST_BLOBFS -eq 1 ]; then
@@ -375,10 +377,6 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then 
	if [[ $SPDK_TEST_FUZZER -eq 1 ]]; then

		run_test "llvm_fuzz" $rootdir/test/fuzz/llvm.sh

	fi



	if [[ $SPDK_TEST_RAID5 -eq 1 ]]; then

		run_test "blockdev_raid5f" $rootdir/test/bdev/blockdev.sh "raid5f"

	fi

fi



trap - SIGINT SIGTERM EXIT

test/bdev/bdev_raid.sh

+9 −11
Original line number Diff line number Diff line
@@ -961,7 +961,6 @@ if [ "$has_nbd" = true ]; then 
	done

fi



if [ "$CONFIG_RAID5F" == y ]; then

for n in {3..4}; do

	run_test "raid5f_state_function_test" raid_state_function_test raid5f $n false

	run_test "raid5f_state_function_test_sb" raid_state_function_test raid5f $n true
@@ -971,7 +970,6 @@ if [ "$CONFIG_RAID5F" == y ]; then 
		run_test "raid5f_rebuild_test_sb" raid_rebuild_test raid5f $n true false true

	fi

done

fi



base_blocklen=4096

test/common/autotest_common.sh

+3 −3
Original line number Diff line number Diff line
@@ -107,6 +107,8 @@ export SPDK_TEST_RBD 
export SPDK_TEST_VHOST

: ${SPDK_TEST_BLOCKDEV=0}

export SPDK_TEST_BLOCKDEV

: ${SPDK_TEST_RAID=0}

export SPDK_TEST_RAID

: ${SPDK_TEST_IOAT=0}

export SPDK_TEST_IOAT

: ${SPDK_TEST_BLOBFS=0}
@@ -139,8 +141,6 @@ export SPDK_TEST_OPAL 
export SPDK_TEST_NATIVE_DPDK

: ${SPDK_AUTOTEST_X=true}

export SPDK_AUTOTEST_X

: ${SPDK_TEST_RAID5=0}

export SPDK_TEST_RAID5

: ${SPDK_TEST_URING=0}

export SPDK_TEST_URING

: ${SPDK_TEST_USDT=0}
@@ -482,7 +482,7 @@ function get_config_params() { 
		config_params+=' --with-ublk'

	fi



	if [ $SPDK_TEST_RAID5 -eq 1 ]; then

	if [ $SPDK_TEST_RAID -eq 1 ]; then

		config_params+=' --with-raid5f'

	fi