From dbb84dd5d675651417d35c0f0370e5b0698aa7b7 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Fri, 27 Mar 2020 14:26:51 +0100 Subject: [PATCH] test/iscsi: run cleanup once before running the tests Run iscsicleanup once before running the tests. This is to ensure we delete any stale entries or files if they were not removed properly in previous test runs. Fixes #1311 Signed-off-by: Karol Latecki Change-Id: Idb415adddfaa7cbb443377a292fae357c1707e79 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1539 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- test/common/autotest_common.sh | 1 + test/iscsi_tgt/iscsi_tgt.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/test/common/autotest_common.sh b/test/common/autotest_common.sh index 884167161..dcfd22933 100755 --- a/test/common/autotest_common.sh +++ b/test/common/autotest_common.sh @@ -578,6 +578,7 @@ function iscsicleanup() { echo "Cleaning up iSCSI connection" iscsiadm -m node --logout || true iscsiadm -m node -o delete || true + rm -rf /var/lib/iscsi/nodes/* } function stop_iscsi_service() { diff --git a/test/iscsi_tgt/iscsi_tgt.sh b/test/iscsi_tgt/iscsi_tgt.sh index bc85875d0..0316229b6 100755 --- a/test/iscsi_tgt/iscsi_tgt.sh +++ b/test/iscsi_tgt/iscsi_tgt.sh @@ -17,6 +17,10 @@ else exit 1 fi +# Run cleanup once to make sure we remove any stale iscsiadm +# entries if they were missed in previous runs +iscsicleanup + # Network configuration create_veth_interfaces $TEST_TYPE