From 9e73683bfadb75454db65bc8440318040a798b84 Mon Sep 17 00:00:00 2001 From: Alena Nikitenko Date: Thu, 3 Feb 2022 05:37:09 +0300 Subject: [PATCH] EX-3342 tests: fix version skip checks in sanity-quota 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-quota test 78 was modified. Fixes: 9abc60b6782 ("LU-15167 quota: fallocate send UID/GID for quota") Test-Parameters: env=ONLY="78" serverversion=2.12.6-ddn42 \ testlist=sanity-quota Test-Parameters: trivial env=ONLY="78" testlist=sanity-quota Signed-off-by: Alena Nikitenko Change-Id: If9022a5006c6d595e12c037aecd5c6eff0096725 Reviewed-on: https://review.whamcloud.com/46443 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/tests/sanity-quota.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/tests/sanity-quota.sh b/lustre/tests/sanity-quota.sh index 260dad1..463b4de 100755 --- a/lustre/tests/sanity-quota.sh +++ b/lustre/tests/sanity-quota.sh @@ -5093,8 +5093,8 @@ run_test 76 "project ID 4294967295 should be not allowed" test_78() { - (( $OST1_VERSION >= $(version_code 2.14.55) )) || - skip "need OST at least 2.14.55" + (( $OST1_VERSION >= $(version_code 2.14.0.31) )) || + skip "need OST at least 2.14.0.31" check_set_fallocate_or_skip setup_quota_test || error "setup quota failed with $?" -- 1.8.3.1