From fc286c0969e6710a2289872730f50e77765b686c Mon Sep 17 00:00:00 2001 From: Alena Nikitenko Date: Wed, 17 Nov 2021 18:11:25 +0300 Subject: [PATCH] EX-3342 tests: correct Lustre version 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 272d, 272e and 272f were modified. Fixes: dfc707a23aa ("LU-11421 dom: manual OST-to-DOM migration via mirroring") Test-Parameters: env=ONLY="272d 272e 272f" serverversion=2.12.6-ddn3 \ serverdistro=el7.7 Test-Parameters: env=ONLY="272d 272e 272f" clientversion=2.12.6-ddn42 Test-Parameters: env=ONLY="272d 272e 272f" serverversion=2.12.6-ddn42 Test-Parameters: trivial env=ONLY="272d 272e 272f" Lustre-change: https://review.whamcloud.com/45590 Lustre-commit: cf7546cd146d3b2db2bd9afc3e31f5ea488b09f5 Signed-off-by: Alena Nikitenko Change-Id: I1c6cba7e738f5ddb7b02ce63ab554a650967b947 Reviewed-by: James Nunez Reviewed-by: Wei Liu Reviewed-by: Andreas Dilger Reviewed-on: https://review.whamcloud.com/46184 Tested-by: jenkins Tested-by: Maloo --- 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 9a7a9be..3b2b104 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -21967,8 +21967,8 @@ test_272c() { run_test 272c "DoM migration: DOM file to the OST-striped file (composite)" test_272d() { - [ $MDS1_VERSION -lt $(version_code 2.12.55) ] && - skip "Need MDS version at least 2.12.55" + [ $MDS1_VERSION -lt $(version_code 2.12.6.10) ] && + skip "Need MDS version at least 2.12.6.10" local dom=$DIR/$tdir/$tfile mkdir -p $DIR/$tdir @@ -22012,8 +22012,8 @@ test_272d() { run_test 272d "DoM mirroring: OST-striped mirror to DOM file" test_272e() { - [ $MDS1_VERSION -lt $(version_code 2.12.55) ] && - skip "Need MDS version at least 2.12.55" + [ $MDS1_VERSION -lt $(version_code 2.12.6.10) ] && + skip "Need MDS version at least 2.12.6.10" local dom=$DIR/$tdir/$tfile mkdir -p $DIR/$tdir @@ -22044,8 +22044,8 @@ test_272e() { run_test 272e "DoM mirroring: DOM mirror to the OST-striped file" test_272f() { - [ $MDS1_VERSION -lt $(version_code 2.12.55) ] && - skip "Need MDS version at least 2.12.55" + [ $MDS1_VERSION -lt $(version_code 2.12.6.10) ] && + skip "Need MDS version at least 2.12.6.10" local dom=$DIR/$tdir/$tfile mkdir -p $DIR/$tdir -- 1.8.3.1