From: Alena Nikitenko Date: Thu, 18 Nov 2021 13:41:13 +0000 (+0300) Subject: EX-3342 tests: correct Lustre version in skip checks in sanity-flr X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=bf86283572ffdaf403a3ca7f02e3fddbf3973a6a;p=fs%2Flustre-release.git EX-3342 tests: correct Lustre version in skip checks in sanity-flr 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-flr tests 44c and 207 were modified. Lustre-change: https://review.whamcloud.com/45607 Lustre-commit: 3b31d79a53a7daebcd214b83b4d0a20d9a570eba Test-Parameters: env=ONLY="44c 207" serverversion=2.12.6-ddn3 serverdistro=el7.7 testlist=sanity-flr Test-Parameters: env=ONLY="44c 207" clientversion=2.12.6-ddn42 testlist=sanity-flr Test-Parameters: env=ONLY="44c 207" serverversion=2.12.6-ddn42 testlist=sanity-flr Test-Parameters: trivial env=ONLY="44c 207" testlist=sanity-flr Fixes: e317b4ef681 ("LU-13730 lod: don't confuse stale with primary flag") Fixes: 6c3a4fad094 ("LU-14526 flr: mirror split downgrade SOM") Signed-off-by: Alena Nikitenko Change-Id: Ic479c21f0d6de644b466291ca82ceb4bbc498d93 Reviewed-on: https://review.whamcloud.com/46424 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh index 09d6d6e..89935b1 100644 --- a/lustre/tests/sanity-flr.sh +++ b/lustre/tests/sanity-flr.sh @@ -2144,8 +2144,8 @@ test_44c() { stack_trap "rm -f $tf" - [ $MDS1_VERSION -ge $(version_code 2.14.0.4) ] || - skip "Need MDS version at least 2.14.0.4" + [ $MDS1_VERSION -ge $(version_code 2.12.6.34) ] || + skip "Need MDS version at least 2.12.6.34" [ "$FSTYPE" != "zfs" ] || skip "ZFS file's block number is not accurate" @@ -3636,8 +3636,8 @@ test_207() { local file=$DIR/$tfile local tmpfile=$DIR/$tfile-tt - [ $MDS1_VERSION -lt $(version_code 2.14.0.4) ] && - skip "Need MDS version at least 2.14.0.4" + [ $MDS1_VERSION -lt $(version_code 2.12.6.19) ] && + skip "Need MDS version at least 2.12.6.19" stack_trap "rm -f $tmpfile $file"