From 8fe552a123fb8d104c0593c1d69a0e3697ca67b9 Mon Sep 17 00:00:00 2001 From: Emoly Liu Date: Sun, 10 May 2015 02:52:05 +0800 Subject: [PATCH] LU-6468 tests: skip conf-sanity.sh test_83 for 2.6.90 or older Skip conf-sanity.sh test_83 if OST server version is older than 2.6.91. Test-Parameters: alwaysuploadlogs testlist=conf-sanity envdefinitions=ONLY=83 ossjob=lustre-b2_5 mdsjob=lustre-b2_5 ossbuildno=86 mdsbuildno=86 Signed-off-by: Emoly Liu Change-Id: I38fe3a52586dcb4d5706b4d7c379685e09e031cc Reviewed-on: http://review.whamcloud.com/14534 Tested-by: Jenkins Reviewed-by: Andreas Dilger Reviewed-by: Jian Yu --- lustre/tests/conf-sanity.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 3338f5e..25ee1a0 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -5230,16 +5230,18 @@ test_82b() { # LU-4665 run_test 82b "specify OSTs for file with --pool and --ost-list options" test_83() { - local dev - local ostmnt - local fstype - local mnt_opts - + [[ $(lustre_version_code ost1) -ge $(version_code 2.6.91) ]] || + { skip "Need OST version at least 2.6.91" && return 0; } if [ $(facet_fstype $SINGLEMDS) != ldiskfs ]; then skip "Only applicable to ldiskfs-based MDTs" return fi + local dev + local ostmnt + local fstype + local mnt_opts + dev=$(ostdevname 1) ostmnt=$(facet_mntpt ost1) fstype=$(facet_fstype ost1) -- 1.8.3.1