From 77ad7caddb50b7bc67cbfb87f9d146a9739e622d Mon Sep 17 00:00:00 2001
From: Jim Harris <james.r.harris@intel.com>
Date: Fri, 15 Dec 2017 10:40:36 -0700
Subject: [PATCH] test/iscsi: reduce per-patch test times

1) move iscsi_pmem to nightly
2) move idle_migration to nightly
3) reduce number of malloc bdevs and lvols for iscsi_lvol

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I63fa5a2634c6edb08db16267972fd21c20fd84f4

Reviewed-on: https://review.gerrithub.io/391976
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
---
 test/iscsi_tgt/iscsi_tgt.sh       |  9 ++++-----
 test/iscsi_tgt/lvol/iscsi_lvol.sh | 13 ++++++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/test/iscsi_tgt/iscsi_tgt.sh b/test/iscsi_tgt/iscsi_tgt.sh
index 7c8db6ec1..5e6f76bc0 100755
--- a/test/iscsi_tgt/iscsi_tgt.sh
+++ b/test/iscsi_tgt/iscsi_tgt.sh
@@ -30,15 +30,14 @@ run_test ./test/iscsi_tgt/calsoft/calsoft.sh
 run_test ./test/iscsi_tgt/filesystem/filesystem.sh
 run_test ./test/iscsi_tgt/reset/reset.sh
 run_test ./test/iscsi_tgt/rpc_config/rpc_config.sh
-run_test ./test/iscsi_tgt/idle_migration/idle_migration.sh
 run_test ./test/iscsi_tgt/lvol/iscsi_lvol.sh
 run_test ./test/iscsi_tgt/fio/fio.sh
 
-if [ $SPDK_TEST_NVML -eq 1 ]; then
-	run_test ./test/iscsi_tgt/pmem/iscsi_pmem.sh 4096 10
-fi
-
 if [ $RUN_NIGHTLY -eq 1 ]; then
+	if [ $SPDK_TEST_NVML -eq 1 ]; then
+		run_test ./test/iscsi_tgt/pmem/iscsi_pmem.sh 4096 10
+	fi
+	run_test ./test/iscsi_tgt/idle_migration/idle_migration.sh
 	run_test ./test/iscsi_tgt/ip_migration/ip_migration.sh
 	run_test ./test/iscsi_tgt/ext4test/ext4test.sh
 fi
diff --git a/test/iscsi_tgt/lvol/iscsi_lvol.sh b/test/iscsi_tgt/lvol/iscsi_lvol.sh
index 9c73457e5..6e93caa51 100755
--- a/test/iscsi_tgt/lvol/iscsi_lvol.sh
+++ b/test/iscsi_tgt/lvol/iscsi_lvol.sh
@@ -17,6 +17,13 @@ INITIATOR_NAME=ANY
 NETMASK=$INITIATOR_IP/32
 MALLOC_BDEV_SIZE=128
 MALLOC_BLOCK_SIZE=512
+if [ $RUN_NIGHTLY -eq 1 ]; then
+	NUM_MALLOC=10
+	NUM_LVOL=10
+else
+	NUM_MALLOC=2
+	NUM_LVOL=2
+fi
 
 rpc_py="python $rootdir/scripts/rpc.py"
 fio_py="python $rootdir/scripts/fio.py"
@@ -36,15 +43,15 @@ timing_exit start_iscsi_tgt
 
 timing_enter setup
 $rpc_py add_portal_group 1 $TARGET_IP:$PORT
-for i in `seq 0 9`; do
+for i in `seq 1 $NUM_MALLOC`; do
     INITIATOR_TAG=$((i+2))
     $rpc_py add_initiator_group $INITIATOR_TAG $INITIATOR_NAME $NETMASK
     bdev=$($rpc_py construct_malloc_bdev $MALLOC_BDEV_SIZE $MALLOC_BLOCK_SIZE)
     ls_guid=$($rpc_py construct_lvol_store $bdev lvs_$i -c 1048576)
     LUNs=""
-    for j in `seq 0 9`; do
+    for j in `seq 1 $NUM_LVOL`; do
         lb_name=$($rpc_py construct_lvol_bdev -u $ls_guid lbd_$j 10)
-        LUNs+="$lb_name:$j "
+        LUNs+="$lb_name:$((j-1)) "
     done
     $rpc_py construct_target_node Target$i Target${i}_alias "$LUNs" "1:$INITIATOR_TAG" 256 1 0 0 0
 done