From: Andreas Dilger <andreas.dilger@intel.com>
Date: Thu, 27 Apr 2017 04:07:41 +0000 (-0600)
Subject: LU-9411 tests: skip llapi_layout_test 30, 31 for interop
X-Git-Tag: 2.9.58~62
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=87a233e4912852f4b52351364504980a914c31f3;p=fs%2Flustre-release.git

LU-9411 tests: skip llapi_layout_test 30, 31 for interop

The test30, test31 should be skipped if running a pre-PFL MDS
as the PFL layout type is not supported.

Change the test29 skip version to 2.8.55 since the patch for
this test didn't actually land until that version.

Test-Parameters: trivial
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: Ib80bd8a70386b3e8881f8ca3d417a8be18acab07
Reviewed-on: https://review.whamcloud.com/26853
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Bobi Jam <bobijam@hotmail.com>
Reviewed-by: James Nunez <james.a.nunez@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index c1045c2..98d1a05 100755
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -2069,8 +2069,10 @@ test_27D() {
 	pool_add_targets $POOL $ost_range || error "pool_add_targets failed"
 
 	local skip27D
-	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.7.64) ] &&
-		skip27D = "-s 29,30,31"
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.8.55) ] &&
+		skip27D += "-s 29"
+	[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.9.55) ] &&
+		skip27D += "-s 30,31"
 	llapi_layout_test -d$DIR/$tdir -p$POOL -o$OSTCOUNT $skip27D ||
 		error "llapi_layout_test failed"