From: James Nunez Date: Fri, 5 Jun 2020 16:55:44 +0000 (-0600) Subject: LU-13640 tests: add version check to conf-sanity 125 X-Git-Tag: 2.12.6-RC1~64 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=ed064925b48cc5767c46f7ad9836698cbfb0ce14;p=fs%2Flustre-release.git LU-13640 tests: add version check to conf-sanity 125 In Lustre 2.12.3, the l_tunedisk utility was modified to skip tuning devices on the MDS and MGS and conf-santity test 125 was added to check this functionality. Thus, this test should be skipped for all Lustre server versions prior to 2.12.3. Fixes: bab0570ce3081 ("LU-12387 tests: Validate l_tunedisk max_sectors_kb tuning") Test-Parameters: trivial Test-Parameters: serverversion=2.10.8 serverdistro=el7.6 env=ONLY=125 testlist=conf-sanity Signed-off-by: James Nunez Change-Id: I89c2900c2430ff3e76bee297809957380404aa31 Reviewed-on: https://review.whamcloud.com/38850 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Wei Liu Reviewed-by: Oleg Drokin --- diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 11c1ea3..59b51c3d 100644 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -8487,6 +8487,9 @@ check_slaves_max_sectors_kb() test_125() { + [[ "$MDS1_VERSION" -lt $(version_code 2.12.3) ]] && + skip "Need MDS version at least 2.12.3" + local facet_list="mgs mds1 ost1" combined_mgs_mds && facet_list="mgs ost1"