From 0442eb6205344c5c907c63df77ad09bc0a6f89a6 Mon Sep 17 00:00:00 2001 From: James Nunez Date: Wed, 4 Aug 2021 08:47:50 -0600 Subject: [PATCH] LU-14323 tests: skip sanity-flr/pfl tests for older servers MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit sanity-flr test 46 sub tests 7, 8, 9 and 10 and sanity-pfl test 16c were added to lustre-master version 2.13.53.205. When we run version interop testing, these sanity-flr and sanity-pfl tests will fail. Thus skip sanity-flr test 46 subtests 7, 8, 9, and 10 and sanity-pfl test 16c when run with servers with version less than 2.13.53.205 and clients with later version. Fixes: ee916af10de2 (“LU-13366 utils: SEL yaml and copy file support “) Test-Parameters: trivial Test-Parameters: env=ONLY=46 testlist=sanity-flr Test-Parameters: env=ONLY=16 testlist=sanity-pfl Test-Parameters: serverversion=2.12.7 serverdistro=el7.9 env=ONLY=46 testlist=sanity-flr Test-Parameters: serverversion=2.12.7 serverdistro=el7.9 env=ONLY=16 testlist=sanity-pfl Signed-off-by: James Nunez Change-Id: I09b88351a10891f63dceb9a2a74c92e4fffc13c5 Reviewed-on: https://review.whamcloud.com/44494 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Wei Liu --- lustre/tests/sanity-flr.sh | 4 ++++ lustre/tests/sanity-pfl.sh | 3 +++ 2 files changed, 7 insertions(+) diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh index c00b2e7..cff383e 100644 --- a/lustre/tests/sanity-flr.sh +++ b/lustre/tests/sanity-flr.sh @@ -2207,6 +2207,10 @@ test_46() { verify_46 $dir $dir.copy "6. FLR dir" + (( $MDS1_VERSION >= $(version_code 2.13.53.205) )) || + echo "server version $MDS1_VERSION does not support SEL" && + return 0 + ########################### 7. SEL file ############################## echo " ** 7. SEL file" rm -f $file diff --git a/lustre/tests/sanity-pfl.sh b/lustre/tests/sanity-pfl.sh index 5b64432..4a6921a 100644 --- a/lustre/tests/sanity-pfl.sh +++ b/lustre/tests/sanity-pfl.sh @@ -987,6 +987,9 @@ test_16b() { run_test 16b "Verify setstripe/getstripe with YAML config file + overstriping" test_16c() { + (( $MDS1_VERSION >= $(version_code 2.13.53.205) )) || + skip "need MDS version at least 2.13.53.205" + [ $OSTCOUNT -lt 2 ] && skip "needs >= 2 OSTs" local file=$DIR/$tdir/$tfile -- 1.8.3.1