LU-8730 test: Remove duplicate $dev from conf-sanity test_83

Remove duplicate $dev variable passed to add function, which
passes it as argument to mkfs.lustre. mkfs.lustre utility in
Lustre 2.1 throws error when multiple device names passed to it.
Skip test if OSTs are not ldiskfs-based.

Test-Parameters: trivial envdefinitions=ONLY=83 testlist=conf-sanity
Change-Id: I56535aac27e25bbf359bda835b24a56a4101c8ed
Seagate-bug-id: MRP-2239
Signed-off-by: Ashish Maurya <ashish.maurya@seagate.com>
Signed-off-by: Sushant Mane <sushant.mane@seagate.com>
Reviewed-on: http://es-gerrit.xyus.xyratex.com:8080/9425
Tested-by: Jenkins
Reviewed-by: Sergey Cheremencev <sergey.cheremencev@seagate.com>
Reviewed-by: Ujjwal Lanjewar <ujjwal.lanjewar@seagate.com>
Tested-by: Elena V. Gryaznova <elena.gryaznova@seagate.com>
Signed-off-by: Ashish Maurya <ashish.maurya@seagate.com>
Reviewed-on: https://review.whamcloud.com/23249
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 0a8957e..ac29af6 100755 (executable)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -5928,8 +5928,8 @@ run_test 82b "specify OSTs for file with --pool and --ost-list options"
 test_83() {
        [[ $(lustre_version_code ost1) -ge $(version_code 2.6.91) ]] ||
                { skip "Need OST version at least 2.6.91" && return 0; }
 test_83() {
        [[ $(lustre_version_code ost1) -ge $(version_code 2.6.91) ]] ||
                { skip "Need OST version at least 2.6.91" && return 0; }

-       if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then
-               skip "Only applicable to ldiskfs-based MDTs"
+       if [ $(facet_fstype ost1) != ldiskfs ]; then
+               skip "Only applicable to ldiskfs-based OSTs"

                return
        fi
 
                return
        fi
 


@@ -5945,7 +5945,7 @@ test_83() {
        # Mount the OST as an ldiskfs filesystem.
        log "mount the OST $dev as a $fstype filesystem"
        add ost1 $(mkfs_opts ost1 $dev) $FSTYPE_OPT \
        # Mount the OST as an ldiskfs filesystem.
        log "mount the OST $dev as a $fstype filesystem"
        add ost1 $(mkfs_opts ost1 $dev) $FSTYPE_OPT \

-               --reformat $dev $dev > /dev/null ||
+               --reformat $dev > /dev/null ||

                error "format ost1 error"
 
        if ! test -b $dev; then
                error "format ost1 error"
 
        if ! test -b $dev; then