From 0f429f23d1351aa9bacb698e00ffebbef927397f Mon Sep 17 00:00:00 2001 From: Alena Nikitenko Date: Thu, 3 Feb 2022 04:47:50 +0300 Subject: [PATCH] EX-3342 tests: fix Lustre ver 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 test 50c was modified. Fixes: f2d1c4ee463 ("LU-14647 flr: mmap write/punch does not stale other mirrors") Test-Parameters: env=ONLY="50c" serverversion=2.12.6-ddn42 \ testlist=sanity-flr Test-Parameters: trivial env=ONLY="50c" testlist=sanity-flr Signed-off-by: Alena Nikitenko Change-Id: Ia210c88586827bf8a9289cd6f9dd96c5e0cdc319 Reviewed-on: https://review.whamcloud.com/46440 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/sanity-flr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh index 89935b1..9805c34 100644 --- a/lustre/tests/sanity-flr.sh +++ b/lustre/tests/sanity-flr.sh @@ -2727,7 +2727,7 @@ test_50c() { # fallocate add punch mode in v2_14_51-78 (cb037f305c) if [ "$FSTYPE" == "ldiskfs" ] && - [ $OST1_VERSION -ge $(version_code 2.14.51) ]; then + [ $OST1_VERSION -ge $(version_code 2.14.0.7) ]; then # ZFS does not support fallocate for now fallocate -p -o 1MiB -l 1MiB $tf || error "punch hole in $tf failed" -- 1.8.3.1