EX-3342 tests: correct Lustre version in test skip checks

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.

Fixes: 5cfcd52d (“LU-13417 mdd: set default LMV on ROOT”)
Fixes: c75e68e5 (“LU-14804 nodemap: do not return error for improper ACL”)
Fixes: f2d1c4ee (“LU-14647 flr: mmap write/punch does not stale other mirrors”)
Fixes: 86847243 (“LU-13730 lod: don't confuse stale with primary flag”)

Test-Parameters: trivial env=ONLY="0 432" testlist=sanity
Test-Parameters: env=ONLY="50 207" testlist=sanity-flr

Change-Id: I9f1f0c1b89d5df7082e4fcaee385b724a453f331
Signed-off-by: James Nunez <jnunez@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/44906
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/lustre/tests/sanity-flr.sh b/lustre/tests/sanity-flr.sh
index afb8462..5561b71 100644 (file)
--- a/lustre/tests/sanity-flr.sh
+++ b/lustre/tests/sanity-flr.sh
@@ -3333,11 +3333,11 @@ function test_206() {
 run_test 206 "lfs setstripe -pool .. --comp-flags=.. "
 
 test_207() {
-       local file=$DIR/$tfile
-       local tmpfile=$DIR/$tfile-tt
+       local file=$DIR/$tfile
+       local tmpfile=$DIR/$tfile-tt
 
-       [ $MDS1_VERSION -lt $(version_code 2.14.50) ] &&
-               skip "Need MDS version at least 2.14.50"
+       [ $MDS1_VERSION -lt $(version_code 2.14.0.4) ] &&
+               skip "Need MDS version at least 2.14.0.4"
 
        stack_trap "rm -f $tmpfile $file"
 

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index b14ca6a..b7f157d 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -255,8 +255,8 @@ test_0e() { # LU-13417
        (( $MDSCOUNT > 1 )) ||
                skip "We need at least 2 MDTs for this test"
 
-       (( $MDS1_VERSION >= $(version_code 2.14.50) )) ||
-               skip "Need server version at least 2.14.50"
+       (( $MDS1_VERSION >= $(version_code 2.14.0.8) )) ||
+               skip "Need server version at least 2.14.0.8"
 
        local default_lmv_count=$($LFS getdirstripe -D -c $MOUNT)
        local default_lmv_index=$($LFS getdirstripe -D -i $MOUNT)
@@ -25197,8 +25197,8 @@ cleanup_test_432() {
 test_432() {
        local tmpdir=$TMP/dir432
 
-       (( $MDS1_VERSION >= $(version_code 2.14.52) )) ||
-               skip "Need MDS version at least 2.14.52"
+       (( $MDS1_VERSION >= $(version_code 2.14.0.7) )) ||
+               skip "Need MDS version at least 2.14.0.7"
 
        stack_trap cleanup_test_432 EXIT
        mkdir $DIR/$tdir