From df5b71a5e8031929d816b19a2f045bfa40388b5b Mon Sep 17 00:00:00 2001 From: Sebastien Buisson Date: Mon, 9 Mar 2020 17:47:13 +0900 Subject: [PATCH] LU-13343 tests: skip recovery-small test_140 with SSK recovery-small test_140a and test_140b are using a 'local client', ie a client mounted on a server node. This is not compatible with SSK keys installed by the test framework, so just skip these tests when running with SSK. Test-Parameters: trivial Test-Parameters: env=SHARED_KEY=true,ONLY=140 testlist=recovery-small Signed-off-by: Sebastien Buisson Change-Id: I420deed9dbc50da622766648a51f885ed01203c6 Reviewed-on: https://review.whamcloud.com/37832 Tested-by: Maloo Reviewed-by: Andreas Dilger Tested-by: jenkins Reviewed-by: James Nunez --- lustre/tests/recovery-small.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lustre/tests/recovery-small.sh b/lustre/tests/recovery-small.sh index aff307a..0b9285f 100755 --- a/lustre/tests/recovery-small.sh +++ b/lustre/tests/recovery-small.sh @@ -2919,6 +2919,9 @@ test_140a() { [ $MDS1_VERSION -lt $(version_code 2.12.58) ] && skip "Need MDS version at least 2.13.50" + [ "$SHARED_KEY" = true ] && + skip "server local client incompatible with SSK keys installed" + slr=$(do_facet mds1 \ $LCTL get_param -n mdt.$FSNAME-MDT0000.local_recovery) stack_trap "do_facet mds1 $LCTL set_param \ @@ -2953,6 +2956,9 @@ test_140b() { [ $MDS1_VERSION -lt $(version_code 2.12.58) ] && skip "Need MDS version at least 2.13.50" + [ "$SHARED_KEY" = true ] && + skip "server local client incompatible with SSK keys installed" + slr=$(do_facet mds1 \ $LCTL get_param -n mdt.$FSNAME-MDT0000.local_recovery) stack_trap "do_facet mds1 $LCTL set_param \ -- 1.8.3.1