From 3a36f39a86d6b9984edbeb08dbd74bebc3b579ee Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Thu, 19 Feb 2015 10:59:41 -0800 Subject: [PATCH] LU-6106 test: skip test_16 to test_23 if MDS version older than 2.6.90 Skip sanity-sec test_16 to test_23 if MDS version older than 2.6.90. The previous commit 0f95dae3a7a0bdef52160a3ca76fefac6765007c doesn't prevent the tests from being run, fix the problem in this one. Change-Id: I791f1e81c248979270524d57305e545f388a9d67 Signed-off-by: Wei Liu Reviewed-on: http://review.whamcloud.com/13806 Tested-by: Jenkins Reviewed-by: Jian Yu Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/tests/sanity-sec.sh | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh index f407b69..020a735 100644 --- a/lustre/tests/sanity-sec.sh +++ b/lustre/tests/sanity-sec.sh @@ -1236,15 +1236,18 @@ test_fops() { return $rc } +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+" && + return 1 + return 0 +} + nodemap_test_setup() { local rc local active_nodemap=$1 - remote_mgs_nodsh && skip "remote MGS with nodsh" && return - [ $(lustre_version_code $SINGLEMGS) -lt $(version_code 2.6.90) ] && - skip "Skip test on $(get_lustre_version) MGS, need 2.6.90+" && - return - do_nodes $(comma_list $(all_mdts_nodes)) $LCTL set_param \ mdt.*.identity_upcall=NONE @@ -1295,6 +1298,7 @@ nodemap_clients_admin_trusted() { } test_16() { + nodemap_version_check || return 0 nodemap_test_setup 0 test_fops all_off @@ -1303,6 +1307,7 @@ test_16() { run_test 16 "test nodemap all_off fileops" test_17() { + nodemap_version_check || return 0 nodemap_test_setup nodemap_clients_admin_trusted 0 1 @@ -1312,6 +1317,7 @@ test_17() { run_test 17 "test nodemap trusted_noadmin fileops" test_18() { + nodemap_version_check || return 0 nodemap_test_setup nodemap_clients_admin_trusted 0 0 test_fops mapped_noadmin 1 @@ -1320,6 +1326,7 @@ test_18() { run_test 18 "test nodemap mapped_noadmin fileops" test_19() { + nodemap_version_check || return 0 nodemap_test_setup nodemap_clients_admin_trusted 1 1 test_fops trusted_admin 1 @@ -1328,6 +1335,7 @@ test_19() { run_test 19 "test nodemap trusted_admin fileops" test_20() { + nodemap_version_check || return 0 nodemap_test_setup nodemap_clients_admin_trusted 1 0 test_fops mapped_admin 1 @@ -1336,6 +1344,7 @@ test_20() { run_test 20 "test nodemap mapped_admin fileops" test_21() { + nodemap_version_check || return 0 nodemap_test_setup local x=1 local i=0 @@ -1357,6 +1366,7 @@ test_21() { run_test 21 "test nodemap mapped_trusted_noadmin fileops" test_22() { + nodemap_version_check || return 0 nodemap_test_setup local x=1 local i=0 @@ -1440,6 +1450,7 @@ nodemap_acl_test() { } test_23() { + nodemap_version_check || return 0 nodemap_test_setup # 1 trusted cluster, 1 mapped cluster -- 1.8.3.1