LU-13417 tests: fix interop version check for tests

Fix version check in tests so that they actually run.

Add a spelling.txt rule for wrong version checks used in tests.

Test-Parameters: trivial testlist=sanity-hsm env=ONLY=12s
Fixes: ca1f7f6899 ("LU-15132 hsm: Protect against parallel HSM restore requests")
Fixes: b1b3c1413a ("LU-15727 lod: honor append_pool with default composite layouts")
Fixes: f1a5ef423e ("LU-15938 llog: more checks in llog_reader")
Fixes: 4e43fe8d0c ("LU-14719 lod: distributed transaction check space")
Fixes: 56ea02d192 ("LU-15850 lmv: always space-balance r-r directories")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I5241d4b419876b8f9cc6799757d6f205ee7b9e82
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/50256
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/contrib/scripts/spelling.txt b/contrib/scripts/spelling.txt
index c963910..d6fd75a 100644 (file)
--- a/contrib/scripts/spelling.txt
+++ b/contrib/scripts/spelling.txt
@@ -205,4 +205,5 @@ struct timeval||struct timespec64
 tempnam||mkstemp
 time_t||timeout_t
 timer_setup||cfs_timer_setup
+version_code.*2.1[5-9]||version 2.14.0.x should be used
 wait_queue_t||wait_queue_entry_t

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index 3244fa8..4db2769 100755 (executable)
--- a/lustre/tests/sanity-hsm.sh
+++ b/lustre/tests/sanity-hsm.sh
@@ -1397,8 +1397,8 @@ test_12s() {
        local fid
        local pid1 pid2
 
-       (( MDS1_VERSION >= $(version_code 2.15.50) )) ||
-               skip "Need MDS version newer than 2.15.50"
+       (( MDS1_VERSION >= $(version_code 2.14.0.63) )) ||
+               skip "Need MDS version newer than 2.14.0.63"
 
        # test needs a running copytool
        copytool setup

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 1030602..ce6221f 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -3225,9 +3225,8 @@ test_27U() {
        local stripe_count2
        local mdts=$(comma_list $(mdts_nodes))
 
-       # FIMXE
-       # (( $MDS1_VERSION >= $(version_code 2.15.42) )) ||
-       #       skip "Need MDS version at least 2.15.42"
+       (( $MDS1_VERSION >= $(version_code 2.14.0.5) )) ||
+               skip "Need MDS version at least 2.14.0.5"
 
        # Validate existing append_* params and ensure restore
        pool=$(do_facet mds1 $LCTL get_param -n mdd.$FSNAME-MDT0000.append_pool)
@@ -8420,8 +8419,8 @@ test_60i() {
 run_test 60i "llog: new record vs reader race"
 
 test_60j() {
-       (( $MDS1_VERSION >= $(version_code 2.15.50) )) ||
-               skip "need MDS version at least 2.15.50"
+       (( $MDS1_VERSION >= $(version_code 2.14.0.68) )) ||
+               skip "need MDS version at least 2.14.0.68"
        [[ $PARALLEL != "yes" ]] || skip "skip parallel run"
        remote_mds_nodsh && skip "remote MDS with nodsh"
        [[ "$mds1_FSTYPE" == "ldiskfs" ]] || skip "ldiskfs only test"
@@ -20667,8 +20666,8 @@ run_test 230w "non-recursive mode dir migration"
 
 test_230x() {
        (( MDSCOUNT > 1 )) || skip "needs >= 2 MDTs"
-       (( MDS1_VERSION >= $(version_code 2.15.0) )) ||
-               skip "Need MDS version at least 2.15.0"
+       (( MDS1_VERSION >= $(version_code 2.14.0.65) )) ||
+               skip "Need MDS version at least 2.14.0.65"
 
        mkdir -p $DIR/$tdir || error "mkdir failed"
        createmany -d $DIR/$tdir/sub 100 || error "createmany failed"
@@ -25977,8 +25976,8 @@ test_413h() {
        (( MDSCOUNT >= 2 )) ||
                skip "We need at least 2 MDTs for this test"
 
-       (( MDS1_VERSION >= $(version_code 2.15.50.6) )) ||
-               skip "Need server version at least 2.15.50.6"
+       (( MDS1_VERSION >= $(version_code 2.14.0.56) )) ||
+               skip "Need server version at least 2.14.0.56"
 
        local lmv_qos_maxage=$($LCTL get_param -n lmv.*.qos_maxage)