From 583fef9966f2e531b1c255cabaf1fbaa323e8e5d Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 11 May 2015 17:21:27 -0600 Subject: [PATCH] LU-790 tests: remove old get_lustre_version() calls Replace old get_lustre_version() calls with lustre_build_version(), since the former was deleted in commit 2a223541d2. The few places using get_lustre_version() were non-critical (just advisory messages) but may generate errors messages in the test output. Fix sanity-sec.sh to check the version on the mgs facet instead of the mds1 facet, in case they are on separate nodes at some point. Signed-off-by: Andreas Dilger Change-Id: I448bc13abbd36e86d0aa8cd6e22bacc9b6def27c Reviewed-on: http://review.whamcloud.com/14768 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Niu Yawei Reviewed-by: James Nunez --- lustre/tests/conf-sanity.sh | 2 +- lustre/tests/sanity-sec.sh | 40 ++++++++++++++++++++-------------------- lustre/tests/sanity.sh | 10 +++++----- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 25ee1a0..c7448da 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -1658,7 +1658,7 @@ t32_test() { echo " Commit: $img_commit" echo " Kernel: $img_kernel" echo " Arch: $img_arch" - echo "OST version: $(get_lustre_version ost1)" + echo "OST version: $(lustre_build_version ost1)" # The conversion can be made only when both of the following # conditions are satisfied: diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index 020a735..ae5112b 100644 --- a/lustre/tests/sanity-sec.sh +++ b/lustre/tests/sanity-sec.sh @@ -628,8 +628,8 @@ test_7() { local rc remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(get_lustre_version) MGS, need 2.5.53+" && + [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && + skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && return create_nodemaps @@ -648,8 +648,8 @@ test_8() { local rc remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(get_lustre_version) MGS, need 2.5.53+" && + [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && + skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && return # Set up nodemaps @@ -679,8 +679,8 @@ test_9() { local rc remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(get_lustre_version) MGS, need 2.5.53+" && + [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && + skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && return rc=0 @@ -717,8 +717,8 @@ test_10() { local rc remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(get_lustre_version) MGS, need 2.5.53+" && + [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && + skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && return rc=0 @@ -764,8 +764,8 @@ test_11() { local rc remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(get_lustre_version) MGS, need 2.5.53+" && + [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && + skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && return rc=0 @@ -794,8 +794,8 @@ test_12() { local rc remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(get_lustre_version) MGS, need 2.5.53+" && + [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && + skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && return rc=0 @@ -832,8 +832,8 @@ test_13() { local rc remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(get_lustre_version) MGS, need 2.5.53+" && + [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && + skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && return rc=0 @@ -875,8 +875,8 @@ test_14() { local rc remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(get_lustre_version) MGS, need 2.5.53+" && + [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && + skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && return rc=0 @@ -910,8 +910,8 @@ test_15() { local rc remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.5.53) ] && - skip "No nodemap on $(get_lustre_version) MGS, need 2.5.53+" && + [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && + skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && return rc=0 @@ -1238,8 +1238,8 @@ test_fops() { nodemap_version_check () { remote_mgs_nodsh && skip "remote MGS with nodsh" && return 1 - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.6.90) ] && - skip "Skip test on $(get_lustre_version) MGS, need 2.6.90+" && + [ $(lustre_version_code mgs) -lt $(version_code 2.5.53) ] && + skip "No nodemap on $(lustre_build_version mgs) MGS < 2.5.53" && return 1 return 0 } diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index e7747e5..5ed33d8 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -4945,10 +4945,10 @@ run_test 56x "lfs migration support" test_56y() { [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.53) ] && - skip "No HSM support on MDS of $(get_lustre_version)," \ - "need 2.4.53 at least" && return - local res="" + skip "No HSM $(lustre_build_version $SINGLEMDS) MDS < 2.4.53" && + return + local res="" local dir0=$DIR/$tdir/$testnum mkdir -p $dir0 || error "creating dir $dir0" local f1=$dir0/file1 @@ -12351,8 +12351,8 @@ run_test 228c "NOT shrink the last entry in OI index node to recycle idle leaf" test_229() { # LU-2482, LU-3448 [ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.4.53) ] && - skip "No HSM support on MDS of $(get_lustre_version)," \ - "need 2.4.53 at least" && return + skip "No HSM $(lustre_build_version $SINGLEMDS) MDS < 2.4.53" && + return [ $PARALLEL == "yes" ] && skip "skip parallel run" && return [ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" && return -- 1.8.3.1