From: Alena Nikitenko Date: Tue, 28 Dec 2021 14:37:20 +0000 (+0300) Subject: EX-3342 tests: fix Lustre ver in skip checks in replay-single X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=e74c8c46edc5b94fc59a6f7ac0f85b62ab68ebf0;p=fs%2Flustre-release.git EX-3342 tests: fix Lustre ver in skip checks in replay-single 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. Replay-single tests 2d,80c,80d were modified. Lustre-change: https://review.whamcloud.com/45948 Lustre-commit: a5f7c423b685517a8ff805f3602f56aec3fdedda Test-Parameters: env=ONLY="2d 80c 80d" serverversion=2.10.8 \ serverdistro=el7.6 testlist=replay-single Test-Parameters: env=ONLY="2d 80c 80d" clientversion=2.12.6-ddn42 \ testlist=replay-single Test-Parameters: env=ONLY="2d 80c 80d" serverversion=2.12.6-ddn42 \ testlist=replay-single Test-Parameters: trivial env=ONLY="2d 80c 80d" testlist=replay-single Fixes: c44b6a5f36c ("LU-10143 tests: Add version check for interop") Signed-off-by: Alena Nikitenko Change-Id: I6491e8ef2828ed73d049dd97a240298c08670daf Reviewed-on: https://review.whamcloud.com/46419 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- diff --git a/lustre/tests/replay-single.sh b/lustre/tests/replay-single.sh index e732ec4..37a4f82 100755 --- a/lustre/tests/replay-single.sh +++ b/lustre/tests/replay-single.sh @@ -124,7 +124,7 @@ run_test 2c "setstripe replay" test_2d() { [[ "$mds1_FSTYPE" = zfs ]] && - [[ "$MDS1_VERSION" -lt $(version_code 2.12.51) ]] && + [[ "$MDS1_VERSION" -lt $(version_code 2.12.3.1) ]] && skip "requires LU-10143 fix on MDS" replay_barrier $SINGLEMDS $LFS setdirstripe -i 0 -c $MDSCOUNT $DIR/$tdir @@ -2641,7 +2641,7 @@ run_test 80b "DNE: create remote dir, drop update rep from MDT0, fail MDT1" test_80c() { [[ "$mds1_FSTYPE" = zfs ]] && - [[ $MDS1_VERSION -lt $(version_code 2.12.51) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.12.3.1) ]] && skip "requires LU-10143 fix on MDS" [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" ([ $FAILURE_MODE == "HARD" ] && @@ -2673,7 +2673,7 @@ run_test 80c "DNE: create remote dir, drop update rep from MDT1, fail MDT[0,1]" test_80d() { [[ "$mds1_FSTYPE" = zfs ]] && - [[ $MDS1_VERSION -lt $(version_code 2.12.51) ]] && + [[ $MDS1_VERSION -lt $(version_code 2.12.3.1) ]] && skip "requires LU-10143 fix on MDS" [ $MDSCOUNT -lt 2 ] && skip "needs >= 2 MDTs" local MDTIDX=1