LU-13271 tests: skip 87, 115 tests if FILESET set

When FILESET is set the tests require Lustre root mounted
on $MOUNT are to be skipped.

Test-Parameters: trivial testlist=conf-sanity envdefinitions="FILESET=/subdir" envdefinitions=ONLY=87
Test-Parameters: testlist=conf-sanity envdefinitions="FILESET=/subdir" envdefinitions=ONLY=115
Signed-off-by: Elena Gryaznova <c17455@cray.com>
Reviewed-by: Vladimir Saveliev <vladimir.saveliev@hpe.com>
Reviewed-by: Alexander Boyko <alexander.boyko@hpe.com>
Change-Id: I8931d0419d3613caf53497c99ad8185dc2b56fad
Reviewed-on: https://review.whamcloud.com/37647
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Vladimir Saveliev <c17830@cray.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 0ca6ce9..fcdd734 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -6283,6 +6283,7 @@ test_87() { #LU-6544
                skip "ldiskfs only test"
        [[ $OSTCOUNT -gt 59 ]] &&
                skip "Ignore wide striping situation"
                skip "ldiskfs only test"
        [[ $OSTCOUNT -gt 59 ]] &&
                skip "Ignore wide striping situation"

+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"

 
        local mdsdev=$(mdsdevname 1)
        local mdsvdev=$(mdsvdevname 1)
 
        local mdsdev=$(mdsdevname 1)
        local mdsvdev=$(mdsvdevname 1)


@@ -8340,6 +8341,7 @@ test_115() {
        if [ "$mds1_FSTYPE" != ldiskfs ]; then
                skip "Only applicable to ldiskfs-based MDTs"
        fi
        if [ "$mds1_FSTYPE" != ldiskfs ]; then
                skip "Only applicable to ldiskfs-based MDTs"
        fi

+       [ -n "$FILESET" ] && skip "Not functional for FILESET set"

 
        local dbfs_ver=$(do_facet $SINGLEMDS $DEBUGFS -V 2>&1)
 
 
        local dbfs_ver=$(do_facet $SINGLEMDS $DEBUGFS -V 2>&1)