From: James Nunez <james.a.nunez@intel.com>
Date: Mon, 7 Aug 2017 17:29:50 +0000 (-0600)
Subject: LU-9826 tests: Do not run conf-sanity 32b with ZFS
X-Git-Tag: 2.10.52~24
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=d564becbe58f7fb349cbe19a7f23e447278310d5

LU-9826 tests: Do not run conf-sanity 32b with ZFS

With ZFS 0.7.0, conf-sanity test 32b consistently fails
in automated testing. Since the issue may be the VM test
environment, add conf-sanity test 32b to the
ALWAYS_EXCEPT list for ZFS testing.

Test-Parameters: trivial testlist=conf-sanity
Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: Ib8582b85760057045bc7cce66d470e81e0e43dde
Reviewed-on: https://review.whamcloud.com/28408
Tested-by: Jenkins
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 371776d..6febf80 100644
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -68,8 +68,8 @@ OSTDEV1_2=$fs2ost_DEV
 OSTDEV2_2=$fs3ost_DEV
 
 if ! combined_mgs_mds; then
-    # bug number for skipped test:    23954
-    ALWAYS_EXCEPT="$ALWAYS_EXCEPT       24b"
+	# bug number for skipped test:    23954
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT       24b"
 fi
 
 # pass "-E lazy_itable_init" to mke2fs to speed up the formatting time
@@ -78,8 +78,8 @@ if [[ "$LDISKFS_MKFS_OPTS" != *lazy_itable_init* ]]; then
 fi
 
 [ $(facet_fstype $SINGLEMDS) = "zfs" ] &&
-# bug number for skipped test:
-	ALWAYS_EXCEPT="$ALWAYS_EXCEPT"
+# bug number for skipped test:        LU-9826
+	ALWAYS_EXCEPT="$ALWAYS_EXCEPT 32b"
 
 init_logging