From eb96839fad363be810fd353bb2bb0b3cd104777e Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Tue, 2 Dec 2014 16:40:08 -0800 Subject: [PATCH] LU-5142 tests: add version check codes to conf-sanity test 43 This patch adds Lustre version check codes into conf-sanity test 43 to make the test interoperate with servers that do not have the following changes: Lustre-commit: 3064318df90ce7019b83c8a7f80e93a9634c00fa Lustre-change: http://review.whamcloud.com/5700 Lustre-commit: 917b0a17d4e50db9f966763925a2dc860d932a3b Lustre-change: http://review.whamcloud.com/9221 Test-Parameters: alwaysuploadlogs envdefinitions=ONLY=43 \ ossjob=lustre-b2_4 mdsjob=lustre-b2_4 ossbuildno=73 mdsbuildno=73 \ testlist=conf-sanity Signed-off-by: Jian Yu Change-Id: I7e12038cc8f77d3a9dbe19806133c21580bfd484 Reviewed-on: http://review.whamcloud.com/12911 Tested-by: Jenkins Reviewed-by: Bob Glossman Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 796f353..fa35185 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -2670,6 +2670,13 @@ test_42() { #bug 14693 run_test 42 "allow client/server mount/unmount with invalid config param" test_43() { + local server_version=$(lustre_version_code $SINGLEMDS) + + [[ $server_version -ge $(version_code 2.5.59) ]] || + [[ $server_version -ge $(version_code 2.5.3) && + $server_version -lt $(version_code 2.5.11) ]] || + { skip "Need MDS version 2.5.4+ or 2.5.59+"; return; } + [ $UID -ne 0 -o $RUNAS_ID -eq 0 ] && skip_env "run as root" ID1=${ID1:-501} -- 1.8.3.1