From 305548c41a00e189262abdd27fa00f5f1dd5a16a Mon Sep 17 00:00:00 2001 From: Elena Gryaznova Date: Sun, 4 Mar 2018 21:17:38 +0300 Subject: [PATCH] LU-10596 tests: skip tests require remote server with nodsh Patch fixes the following tests to be skipped for remote servers with nodsh set: sanity 56c, 60aa, 77c, 101g, 160f, 160g, 161d Patch skips 160f and 160g for old MDS. Signed-off-by: Elena Gryaznova Test-Parameters: trivial testlist=sanity Cray-bug-id: MRP-4757, LUS-5710 Reviewed-by: Andriy Skulysh Reviewed-by: Vitaly Fertman Change-Id: I44f35129df5bc5c8c6e6ace3e68f3f2d400db86c Reviewed-on: https://review.whamcloud.com/31121 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Vladimir Saveliev Reviewed-by: Andreas Dilger --- lustre/tests/sanity.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 58ebd66..61e6b0d 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -4697,6 +4697,8 @@ test_56b() { run_test 56b "check $LFS getdirstripe" test_56c() { + remote_ost_nodsh && skip "remote OST with nodsh" && return + local ost_idx=0 local ost_name=$(ostname_from_index $ost_idx) local old_status=$(ost_dev_status $ost_idx) @@ -6065,6 +6067,8 @@ test_60a() { run_test 60a "llog_test run from kernel module and test llog_reader" test_60aa() { + remote_mgs_nodsh && skip "remote MGS with nodsh" && return + # test old logid format if [ $(lustre_version_code mgs) -le $(version_code 3.1.53) ]; then do_facet mgs $LCTL dl | grep MGS @@ -6838,6 +6842,8 @@ cleanup_77c() { } test_77c() { + remote_ost_nodsh && skip "remote OST with nodsh" && return + [ $PARALLEL == "yes" ] && skip "skip parallel run" && return $GSS && skip "could not run with gss" && return @@ -7579,6 +7585,8 @@ test_101g_brw_size_test() { } test_101g() { + remote_ost_nodsh && skip "remote OST with nodsh" && return + local rpcs local osts=$(get_facets OST) local list=$(comma_list $(osts_nodes)) @@ -11928,6 +11936,10 @@ test_160e() { run_test 160e "changelog negative testing (should return errors)" test_160f() { + remote_mds_nodsh && skip "remote MDS with nodsh" && return + [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.56) ]] || + { skip "Need MDS version at least 2.10.56"; return 0; } + local mdts=$(comma_list $(mdts_nodes)) # Create a user @@ -12000,6 +12012,10 @@ test_160f() { run_test 160f "changelog garbage collect (timestamped users)" test_160g() { + remote_mds_nodsh && skip "remote MDS with nodsh" && return + [[ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.10.56) ]] || + { skip "Need MDS version at least 2.10.56"; return 0; } + local mdts=$(comma_list $(mdts_nodes)) #define OBD_FAIL_TIME_IN_CHLOG_USER 0x1314 @@ -12238,6 +12254,8 @@ test_161c() { run_test 161c "check CL_RENME[UNLINK] changelog record flags" test_161d() { + remote_mds_nodsh && skip "remote MDS with nodsh" && return + local pid local fid -- 1.8.3.1