Commit d87cd2c4 authored by Michal Berger's avatar Michal Berger Committed by Tomasz Zawadzki
Browse files

test/iscsi_tgt: Remove use of $NO_NVME 



CI is not using it and there's no clear indication of how it supposed
to be used considering that gen_nvme.sh's output is not sanitized
during the test. Just nuke it.

Change-Id: I895405f2b3c19ac6be5f1a5adce074e77bc0274e
Signed-off-by: default avatarMichal Berger <michal.berger@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/21101


Reviewed-by: default avatarBen Walker <ben@nvidia.com>
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarJim Harris <jim.harris@samsung.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent aa9116de

test/iscsi_tgt/ext4test/ext4test.sh

+6 −12
Original line number Diff line number Diff line
@@ -70,15 +70,11 @@ $rpc_py bdev_error_inject_error EE_Malloc0 'clear' 'failure' 
$rpc_py iscsi_delete_target_node $node_base:Target0

echo "Error injection test done"



if [ -z "$NO_NVME" ]; then

bdev_size=$(get_bdev_size Nvme0n1)

split_size=$((bdev_size / 2))

	if [ $split_size -gt 10000 ]; then

		split_size=10000

	fi

split_size=$((split_size > 10000 ? 10000 : split_size))

$rpc_py bdev_split_create Nvme0n1 2 -s $split_size

$rpc_py iscsi_create_target_node Target1 Target1_alias Nvme0n1p0:0 1:2 64 -d

fi



iscsiadm -m discovery -t sendtargets -p $TARGET_IP:$ISCSI_PORT

iscsiadm -m node --login -p $TARGET_IP:$ISCSI_PORT
@@ -126,9 +122,7 @@ iscsicleanup 
$rpc_py bdev_split_delete Nvme0n1

$rpc_py bdev_error_delete EE_Malloc0



if [ -z "$NO_NVME" ]; then

$rpc_py bdev_nvme_detach_controller Nvme0

fi



killprocess $pid

iscsitestfini