From a8d68a0bce02b577a2502327273dc0872097759d Mon Sep 17 00:00:00 2001 From: Alena Nikitenko Date: Wed, 29 Dec 2021 14:47:45 +0300 Subject: [PATCH] EX-3342 tests: fix Lustre ver in skip checks in sanity Many patches land to the EXAScaler branches as ports from other branches. Sometimes the tests that are included with the ported patches check the version of Lustre to ensure that the feature it tests exists in this version of Lustre. These version values are not always changed when patches are ported from one branch to another. Change Lustre test suite version checks to be relative to this branch. Sanity tests 24z,27M,36g were modified. Fixes: 9cbefa99f23 ("LU-12037 mdt: add option for cross-MDT rename") Fixes: 3c0733aea94 ("LU-9341 lod: Add special O_APPEND striping") Fixes: 5456b1bdbf9 ("LU-10496 tgt: move FMD handling from OFD to target") Test-Parameters: env=ONLY="24z 27M 36g" serverversion=2.10.8 \ serverdistro=el7.6 Test-Parameters: env=ONLY="24z 27M 36g" clientversion=2.12.6-ddn42 Test-Parameters: env=ONLY="24z 27M 36g" serverversion=2.12.6-ddn42 Test-Parameters: trivial env=ONLY="24z 27M 36g" Lustre-change: https://review.whamcloud.com/45951 Lustre-commit: 1c8ed467169e27302ec53c43751496c31de2f51a Signed-off-by: Alena Nikitenko Change-Id: I151d9a0a90a27f1b47a567b40c6f1f4ea641420a Reviewed-on: https://review.whamcloud.com/46407 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/tests/sanity.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 175dd37..73b84ca 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -1332,8 +1332,8 @@ run_test 24y "rename/link on the same dir should succeed" test_24z() { [[ $MDSCOUNT -lt 2 ]] && skip_env "needs >= 2 MDTs" - [[ $MDS1_VERSION -lt $(version_code 2.12.51) ]] && - skip "Need MDS version at least 2.12.51" + [[ $MDS1_VERSION -lt $(version_code 2.12.3.1) ]] && + skip "Need MDS version at least 2.12.3.1" local index @@ -3010,8 +3010,8 @@ test_27L() { run_test 27L "lfs pool_list gives correct pool name" test_27M() { - [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.12.57) ]] && - skip "Need MDS version >= than 2.12.57" + [[ $(lustre_version_code $SINGLEMDS) -lt $(version_code 2.12.3.3) ]] && + skip "Need MDS version >= than 2.12.3.3" remote_mds_nodsh && skip "remote MDS with nodsh" [[ $OSTCOUNT -lt 2 ]] && skip_env "need > 1 OST" @@ -4251,8 +4251,8 @@ run_test 36f "utime on file racing with OST BRW write ==========" test_36g() { remote_ost_nodsh && skip "remote OST with nodsh" [ $PARALLEL == "yes" ] && skip "skip parallel run" - [ $MDS1_VERSION -lt $(version_code 2.12.51) ] && - skip "Need MDS version at least 2.12.51" + [ $MDS1_VERSION -lt $(version_code 2.12.3.1) ] && + skip "Need MDS version at least 2.12.3.1" local fmd_max_age local fmd -- 1.8.3.1