From: James Nunez <james.a.nunez@intel.com>
Date: Thu, 25 May 2017 21:52:06 +0000 (-0600)
Subject: LU-9384 tests: restore 2.9 filesystem images on 2.10
X-Git-Tag: 2.9.59~28
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=50d6943184322b56d7f2243930b035d2a7c37e1e;p=fs%2Flustre-release.git

LU-9384 tests: restore 2.9 filesystem images on 2.10

The problem that the 2.9 disk images upgraded to 2.10 caused
is fixed. We can now add back the use of the 2.9 disk image
into the t32_check routine used by conf-sanity test 32*.

Signed-off-by: James Nunez <james.a.nunez@intel.com>
Change-Id: I5c32c05ba31c525d6ff46fbd6ba5edab7368a86b
Reviewed-on: https://review.whamcloud.com/27295
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Wei Liu <wei3.liu@intel.com>
Reviewed-by: Saurabh Tandan <saurabh.tandan@intel.com>
---

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