From: Andreas Dilger <andreas.dilger@intel.com>
Date: Sun, 23 Apr 2017 04:19:00 +0000 (-0600)
Subject: LU-9384 tests: skip 2.9 filesystem images on 2.10
X-Git-Tag: 2.9.57~72
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F26789%2F2;p=fs%2Flustre-release.git

LU-9384 tests: skip 2.9 filesystem images on 2.10

The 2.9 disk images upgraded to 2.10 are causing common test failures
due to small differences in space usage.  Disable testing these images
until a proper fix is available.

Test-Parameters: trivial envdefinitions=ONLY=32 testlist=conf-sanity
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: I64d14ac6b079c50ee234ff886c9a80d9213ebbe5
Reviewed-on: https://review.whamcloud.com/26789
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
---

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 363dfc8..d794a41 100755
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1502,7 +1502,7 @@ t32_check() {
 
 	local IMGTYPE=$(facet_fstype $SINGLEMDS)
 
-	tarballs=$($r find $RLUSTRE/tests -maxdepth 1 -name \'disk*-$IMGTYPE.tar.bz2\')
+	tarballs=$($r find $RLUSTRE/tests -maxdepth 1 -name \'disk*-$IMGTYPE.tar.bz2\' | grep -v "2_9")
 
 	if [ -z "$tarballs" ]; then
 		skip "No applicable tarballs found"