LU-15593 tests: fix version checks for backported patches

Check for 2.14.0.x versions instead of 2.14.5x versions:
   conf-sanity.sh: test_123ag
   sanity.sh: test_27S, test_64i, test_160q, test_413e
   sanity-flr.sh: test_44e
   sanity-sec.sh: test_60

Test-Parameters: trivial testlist=conf-sanity env=ONLY=123
Test-Parameters: testlist=sanity-flr,sanity-sec
Fixes: 32f0bbe2646a ("LU-15176 sec: allow subdir mount of encrypted dir")
Fixes: d053ce30ca2f ("LU-15593 mdt: Add option to disable use of SOM")
Fixes: a35ae4ec46ec ("LU-15142 lctl: fixes for set_param -P and llog_print")
Fixes: d35aa94e79de ("LU-14448 lod: verify LOV before set/inherit")
Fixes: 276182ae9b95 ("LU-13055 changelog: use default mask if server has no mask")
Fixes: 930d4fe4952f ("LU-9704 grant: ignore grant info on read resend")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Ibd0e01ff5ac3b4a810b3eb5b8052e8a727ca416d
Reviewed-on: https://review.whamcloud.com/47206
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Jian Yu <yujian@whamcloud.com>

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index 41a0ac1..a96ab9b 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -8957,8 +8957,8 @@ test_123ag() { # LU-15142
        local orig_val
 
        remote_mgs_nodsh && skip "remote MGS with nodsh"
-       (( $MGS_VERSION >= $(version_code 2.14.55) )) ||
-               skip "Need server version least 2.14.55"
+       (( $MGS_VERSION >= $(version_code 2.14.0.39) )) ||
+               skip "Need server version least 2.14.0.39"
 
        [ -d $MOUNT/.lustre ] || setup
 

diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh
index 36d9b62..70c6e9e 100644 (file)
--- a/lustre/tests/sanity-flr.sh
+++ b/lustre/tests/sanity-flr.sh
@@ -2222,8 +2222,8 @@ test_44e() {
        local size2
 
        test_mkdir $DIR/$tdir
-       [ $MDS1_VERSION -ge $(version_code 2.14.52) ] ||
-               skip "Need MDS version at least 2.14.52"
+       [ $MDS1_VERSION -ge $(version_code 2.14.0.39) ] ||
+               skip "Need MDS version at least 2.14.0.39"
 
        $LFS mirror create -N2 $tf || error "create mirrored file $tf failed"
 

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index 4628fa8..fb8f090 100755 (executable)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -4853,8 +4853,8 @@ test_60() {
        local testdir=$DIR/$tdir/mytestdir
        local testfile=$DIR/$tdir/$tfile
 
-       (( $MDS1_VERSION > $(version_code 2.14.53) )) ||
-               skip "Need MDS version at least 2.14.53"
+       (( $MDS1_VERSION > $(version_code 2.14.0.39) )) ||
+               skip "Need MDS version at least 2.14.0.39"
 
        $LCTL get_param mdc.*.import | grep -q client_encryption ||
                skip "client encryption not supported"

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 64ca378..a555c5a 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -3170,9 +3170,8 @@ test_27N() {
 run_test 27N "lctl pool_list on separate MGS gives correct pool name"
 
 test_27S() {
-       (( $MDS1_VERSION >= $(version_code 2.14.54) )) ||
-       (( $MDS1_VERSION >= $(version_code 2.14.0) )) ||
-               skip "Need MDS version at least 2.14.0"
+       (( $MDS1_VERSION >= $(version_code 2.14.0.30) )) ||
+               skip "Need MDS version at least 2.14.0.30"
        [[ "$(facet_host mds1)" != "$(facet_host ost1)" ]] ||
                skip "needs different host for mdt1 ost1"
 
@@ -8494,8 +8493,8 @@ test_64h() {
 run_test 64h "grant shrink on read"
 
 test_64i() {
-       (( $OST1_VERSION >= $(version_code 2.14.55) )) ||
-               skip "need OST at least 2.14.55 to avoid grant shrink on replay"
+       (( $OST1_VERSION >= $(version_code 2.14.0.39) )) ||
+               skip "need OST >= 2.14.0.39 to avoid grant shrink on replay"
 
        [ $PARALLEL == "yes" ] && skip "skip parallel run"
        remote_ost_nodsh && skip "remote OSTs with nodsh"
@@ -16286,8 +16285,8 @@ test_160q() {
 
        [[ $PARALLEL != "yes" ]] || skip "skip parallel run"
        remote_mds_nodsh && skip "remote MDS with nodsh"
-       [ $MDS1_VERSION -ge $(version_code 2.14.54) ] ||
-               skip "Need MDS version at least 2.14.54"
+       [ $MDS1_VERSION -ge $(version_code 2.14.0.15) ] ||
+               skip "Need MDS version at least 2.14.0.15"
 
        # set server mask to minimal value like server init does
        changelog_chmask "MARK"
@@ -24714,7 +24713,6 @@ test_412() {
        [ $stripe_count -eq 2 ] ||
                error "expect 2 get $stripe_count"
 
-       (( $MDS1_VERSION >= $(version_code 2.14.55) )) ||
        (( $MDS1_VERSION >= $(version_code 2.14.0.29) )) || return 0
 
        local index
@@ -25151,8 +25149,8 @@ run_test 413d "inherit ROOT default LMV"
 test_413e() {
        (( MDSCOUNT >= 2 )) ||
                skip "We need at least 2 MDTs for this test"
-       (( MDS1_VERSION >= $(version_code 2.14.55) )) ||
-               skip "Need server version at least 2.14.55"
+       (( MDS1_VERSION >= $(version_code 2.14.0.8) )) ||
+               skip "Need server version at least 2.14.0.8"
 
        local testdir=$DIR/$tdir
        local tmpfile=$TMP/temp.setdirstripe.stderr.$$