From 2c0008e2257669e1178f68e2b5dd249abb2ffd01 Mon Sep 17 00:00:00 2001 From: Alena Nikitenko Date: Mon, 27 Dec 2021 18:41:50 +0300 Subject: [PATCH] EX-3342 tests: fix Lustre version in skip checks in conf-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. Conf-sanity test_126 was modified. Fixes: efd1b764bac ("LU-11814 obd: Crashed while mount in parallel") Test-Parameters: env=ONLY="126" serverversion=2.10.8 serverdistro=el7.6 \ testlist=conf-sanity Test-Parameters: env=ONLY="126" clientversion=2.12.6-ddn42 testlist=conf-sanity Test-Parameters: env=ONLY="126" serverversion=2.12.6-ddn42 testlist=conf-sanity Test-Parameters: trivial env=ONLY="126" testlist=conf-sanity Lustre-change: https://review.whamcloud.com/45942/ Lustre-commit: 5f2b47b4d9fb4625290c9fa498c776b3df15ceb9 Signed-off-by: Alena Nikitenko Change-Id: I953be8ec00e28b09eb492ffa24c03c50430f59df Reviewed-on: https://review.whamcloud.com/46365 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/tests/conf-sanity.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index cdc0494..a94f674 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -9146,8 +9146,8 @@ test_125() run_test 125 "check l_tunedisk only tunes OSTs and their slave devices" test_126() { - [[ "$MDS1_VERSION" -ge $(version_code 2.13.52) ]] || - skip "Need MDS version at least 2.13.52" + [[ "$MDS1_VERSION" -ge $(version_code 2.12.3.30) ]] || + skip "Need MDS version at least 2.12.3.30" cleanup do_rpc_nodes $(facet_active_host $SINGLEMDS) load_module ../libcfs/libcfs/libcfs -- 1.8.3.1