From 3b91363f656d1fbb6f3ae94b946f40a0745cbc46 Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Sun, 20 Feb 2022 11:43:33 -0700 Subject: [PATCH] LU-15010 tests: skip sanity test_64g/64h for interop Sanity test_64g checks code that was only added in 2.14.56. Lustre-change: https://review.whamcloud.com/46565 Lustre-commit: a57f7708c9e8ecfeca874cda9cebc6b7ced3a9bb Test-Parameters: trivial serverversion=2.14.0 testlist=sanity env=ONLY=64 Fixes: 6e116213e3fd ("LU-15010 mdc: add support for grant shrink") Signed-off-by: Andreas Dilger Change-Id: I339231f1b7890e8fffe7e079a052b15f54d4a050 Reviewed-by: Alex Zhuravlev Reviewed-by: Alena Nikitenko Reviewed-on: https://review.whamcloud.com/46832 --- lustre/tests/sanity.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 47a24f3..07ec2e0 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -8389,8 +8389,8 @@ test_64f() { run_test 64f "check grant consumption (with grant allocation)" test_64g() { - #[ $MDS1_VERSION -lt $(version_code 2.14.54) ] && - # skip "Need MDS version at least 2.14.54" + (( $MDS1_VERSION >= $(version_code 2.14.0.22) )) || + skip "Need MDS version at least 2.14.0.22" local mdts=$(comma_list $(mdts_nodes)) @@ -8433,6 +8433,11 @@ test_64g() { run_test 64g "grant shrink on MDT" test_64h() { + (( $OST1_VERSION >= $(version_code 2.14.0.38) )) || + (( $OST1_VERSION < $(version_code 2.13.0) && + $OST1_VERSION >= $(version_code 2.12.8) )) || + skip "Need OSS version at least 2.14.0.38 or 2.12.8" + local instance=$($LFS getname -i $DIR) local osc_tgt="$FSNAME-OST0000-osc-$instance" local num_exps=$(do_facet ost1 \ -- 1.8.3.1