From 1b5d4b5265be252508872f65341b14cf487a4767 Mon Sep 17 00:00:00 2001 From: Michal Berger Date: Wed, 20 Oct 2021 10:55:43 +0200 Subject: [PATCH] test/nvmf: Limit number of tests executed under uring job The nvmf-tcp-uring-vg job is currently fully packed with tests what causes random timeouts across the CI. Since most of these tests are run as part of the nvmf-tcp-vg job and are not uring dependent we can simply skip them to save some time (~ 5 minutes). Signed-off-by: Michal Berger Change-Id: I5bc85afee094697b74efbef4777cb4eb1be04583 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9937 Community-CI: Broadcom CI Tested-by: SPDK CI Jenkins Reviewed-by: Tomasz Zawadzki Reviewed-by: Jim Harris Reviewed-by: Karol Latecki --- autotest.sh | 6 ++++-- test/nvmf/nvmf.sh | 47 +++++++++++++++++++++++++++++------------------ 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/autotest.sh b/autotest.sh index 674d1b67a..e305b021d 100755 --- a/autotest.sh +++ b/autotest.sh @@ -274,8 +274,10 @@ if [ $SPDK_RUN_FUNCTIONAL_TEST -eq 1 ]; then tcp_device_init timing_exit tcp_setup run_test "nvmf_tcp" ./test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT - run_test "spdkcli_nvmf_tcp" ./test/spdkcli/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT - run_test "nvmf_identify_passthru" test/nvmf/target/identify_passthru.sh --transport=$SPDK_TEST_NVMF_TRANSPORT + if [[ $SPDK_TEST_URING -eq 0 ]]; then + run_test "spdkcli_nvmf_tcp" ./test/spdkcli/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT + run_test "nvmf_identify_passthru" test/nvmf/target/identify_passthru.sh --transport=$SPDK_TEST_NVMF_TRANSPORT + fi run_test "nvmf_dif" test/nvmf/target/dif.sh elif [ "$SPDK_TEST_NVMF_TRANSPORT" = "fc" ]; then run_test "nvmf_fc" ./test/nvmf/nvmf.sh --transport=$SPDK_TEST_NVMF_TRANSPORT diff --git a/test/nvmf/nvmf.sh b/test/nvmf/nvmf.sh index f107313af..06b814cbf 100755 --- a/test/nvmf/nvmf.sh +++ b/test/nvmf/nvmf.sh @@ -13,19 +13,23 @@ trap "exit 1" SIGINT SIGTERM EXIT TEST_ARGS=("$@") -run_test "nvmf_example" test/nvmf/target/nvmf_example.sh "${TEST_ARGS[@]}" -run_test "nvmf_filesystem" test/nvmf/target/filesystem.sh "${TEST_ARGS[@]}" -run_test "nvmf_discovery" test/nvmf/target/discovery.sh "${TEST_ARGS[@]}" -run_test "nvmf_connect_disconnect" test/nvmf/target/connect_disconnect.sh "${TEST_ARGS[@]}" +if [[ $SPDK_TEST_URING -eq 0 ]]; then + run_test "nvmf_example" test/nvmf/target/nvmf_example.sh "${TEST_ARGS[@]}" + run_test "nvmf_filesystem" test/nvmf/target/filesystem.sh "${TEST_ARGS[@]}" + run_test "nvmf_discovery" test/nvmf/target/discovery.sh "${TEST_ARGS[@]}" + run_test "nvmf_connect_disconnect" test/nvmf/target/connect_disconnect.sh "${TEST_ARGS[@]}" +fi run_test "nvmf_host_management" test/nvmf/target/host_management.sh "${TEST_ARGS[@]}" -if [ $SPDK_TEST_NVME_CLI -eq 1 ]; then +if [[ $SPDK_TEST_NVME_CLI -eq 1 && $SPDK_TEST_URING -eq 0 ]]; then run_test "nvmf_nvme_cli" test/nvmf/target/nvme_cli.sh "${TEST_ARGS[@]}" fi run_test "nvmf_lvol" test/nvmf/target/nvmf_lvol.sh "${TEST_ARGS[@]}" run_test "nvmf_vhost" test/nvmf/target/nvmf_vhost.sh "${TEST_ARGS[@]}" run_test "nvmf_bdev_io_wait" test/nvmf/target/bdev_io_wait.sh "${TEST_ARGS[@]}" -run_test "nvmf_create_transport." test/nvmf/target/create_transport.sh "${TEST_ARGS[@]}" -run_test "nvmf_multitarget" test/nvmf/target/multitarget.sh "${TEST_ARGS[@]}" +if [[ $SPDK_TEST_URING -eq 0 ]]; then + run_test "nvmf_create_transport" test/nvmf/target/create_transport.sh "${TEST_ARGS[@]}" + run_test "nvmf_multitarget" test/nvmf/target/multitarget.sh "${TEST_ARGS[@]}" +fi if [ $RUN_NIGHTLY -eq 1 ]; then run_test "nvmf_fuzz" test/nvmf/target/fuzz.sh "${TEST_ARGS[@]}" @@ -34,16 +38,18 @@ if [ $RUN_NIGHTLY -eq 1 ]; then fi run_test "nvmf_nmic" test/nvmf/target/nmic.sh "${TEST_ARGS[@]}" -run_test "nvmf_rpc" test/nvmf/target/rpc.sh "${TEST_ARGS[@]}" run_test "nvmf_fio" test/nvmf/target/fio.sh "${TEST_ARGS[@]}" run_test "nvmf_bdevio" test/nvmf/target/bdevio.sh "${TEST_ARGS[@]}" -run_test "nvmf_invalid" test/nvmf/target/invalid.sh "${TEST_ARGS[@]}" -run_test "nvmf_abort" test/nvmf/target/abort.sh "${TEST_ARGS[@]}" -run_test "nvmf_ns_hotplug_stress" test/nvmf/target/ns_hotplug_stress.sh "${TEST_ARGS[@]}" -run_test "nvmf_connect_stress" test/nvmf/target/connect_stress.sh "${TEST_ARGS[@]}" -run_test "nvmf_delete_subsystem" test/nvmf/target/delete_subsystem.sh "${TEST_ARGS[@]}" +if [[ $SPDK_TEST_URING -eq 0 ]]; then + run_test "nvmf_rpc" test/nvmf/target/rpc.sh "${TEST_ARGS[@]}" + run_test "nvmf_invalid" test/nvmf/target/invalid.sh "${TEST_ARGS[@]}" + run_test "nvmf_abort" test/nvmf/target/abort.sh "${TEST_ARGS[@]}" + run_test "nvmf_ns_hotplug_stress" test/nvmf/target/ns_hotplug_stress.sh "${TEST_ARGS[@]}" + run_test "nvmf_connect_stress" test/nvmf/target/connect_stress.sh "${TEST_ARGS[@]}" + run_test "nvmf_delete_subsystem" test/nvmf/target/delete_subsystem.sh "${TEST_ARGS[@]}" +fi -if [ $SPDK_TEST_VFIOUSER -eq 1 ]; then +if [[ $SPDK_TEST_VFIOUSER -eq 1 && $SPDK_TEST_URING -eq 0 ]]; then run_test "nvmf_vfio_user" test/nvmf/target/nvmf_vfio_user.sh "${TEST_ARGS[@]}" run_test "nvmf_vfio_user_nvme_compliance" test/nvme/compliance/compliance.sh "${TEST_ARGS[@]}" fi @@ -63,13 +69,16 @@ timing_enter host run_test "nvmf_identify" test/nvmf/host/identify.sh "${TEST_ARGS[@]}" run_test "nvmf_perf" test/nvmf/host/perf.sh "${TEST_ARGS[@]}" run_test "nvmf_multipath" test/nvmf/host/multipath.sh "${TEST_ARGS[@]}" -run_test "nvmf_multicontroller" test/nvmf/host/multicontroller.sh "${TEST_ARGS[@]}" + +if [[ $SPDK_TEST_URING -eq 0 ]]; then + run_test "nvmf_multicontroller" test/nvmf/host/multicontroller.sh "${TEST_ARGS[@]}" + run_test "nvmf_aer" test/nvmf/host/aer.sh "${TEST_ARGS[@]}" + run_test "nvmf_async_init" test/nvmf/host/async_init.sh "${TEST_ARGS[@]}" +fi # TODO: disabled due to intermittent failures (RDMA_CM_EVENT_UNREACHABLE/ETIMEDOUT) #run_test test/nvmf/host/identify_kernel_nvmf.sh $TEST_ARGS -run_test "nvmf_aer" test/nvmf/host/aer.sh "${TEST_ARGS[@]}" run_test "nvmf_fio" test/nvmf/host/fio.sh "${TEST_ARGS[@]}" -run_test "nvmf_async_init" test/nvmf/host/async_init.sh "${TEST_ARGS[@]}" # There is an intermittent error relating to those tests and Soft-RoCE. # Skip those tests if we are using rxe. @@ -80,7 +89,9 @@ if ! check_ip_is_soft_roce $NVMF_FIRST_TARGET_IP; then run_test "nvmf_target_disconnect" test/nvmf/host/target_disconnect.sh "${TEST_ARGS[@]}" fi -run_test "dma" test/nvmf/host/dma.sh "${TEST_ARGS[@]}" +if [[ $SPDK_TEST_URING -eq 0 ]]; then + run_test "dma" test/nvmf/host/dma.sh "${TEST_ARGS[@]}" +fi timing_exit host