EX-3342 tests: fix Lustre version in test skip checks in 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. Sanity tests 160j,432,810,812 were modified.

Lustre-change: https://review.whamcloud.com/45967
Lustre-commit: 60186cbf11d7cfa24e94721b8bf77e0dc5af0c50

Test-Parameters: env=ONLY="160j 432 810 812" serverversion=2.10.8 \
serverdistro=el7.6
Test-Parameters: env=ONLY="160j 432 810 812" clientversion=2.12.6-ddn42 \
mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2
Test-Parameters: env=ONLY="160j 432 810 812" serverversion=2.12.6-ddn42 \
mdscount=2 mdtcount=4 osscount=1 ostcount=8 clientcount=2
Test-Parameters: env=ONLY="160j 432 810 812",SHARED_KEY=true mdscount=2 \
mdtcount=4 osscount=1 ostcount=8 clientcount=2 serverversion=2.12.6-ddn42
Test-Parameters: env=ONLY="160j 432 810 812",SHARED_KEY=true mdscount=2 \
mdtcount=4 osscount=1 ostcount=8 clientcount=2 clientversion=2.12.6-ddn42
Test-Parameters: trivial env=ONLY="160j 432 810 812"

Fixes: 9d88030b8a5 ("LU-11626 mdc: hold obd while processing changelog")
Fixes: 6a70c5ec116 ("LU-14804 nodemap: do not return error for improper ACL")
Fixes: bc38e0f6eaa ("LU-12784 llite: limit max xattr size by kernel value")
Fixes: 78ddbc59530 ("LU-11951 ptlrpc: reset generation for old requests")

Signed-off-by: Alena Nikitenko <anikitenko@ddn.com>
Change-Id: I91b45cc9a9d78ab96877edfef59cf6e8fe259452
Reviewed-on: https://review.whamcloud.com/46432
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 990dea1..e83d11a 100755 (executable)
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -15819,8 +15819,8 @@ run_test 160i "changelog user register/unregister race"
 
 test_160j() {
        remote_mds_nodsh && skip "remote MDS with nodsh"
-       [[ $MDS1_VERSION -lt $(version_code 2.12.56) ]] &&
-               skip "Need MDS version at least 2.12.56"
+       [[ $MDS1_VERSION -lt $(version_code 2.12.3.6) ]] &&
+               skip "Need MDS version at least 2.12.3.6"
 
        mount_client $MOUNT2 || error "mount_client on $MOUNT2 failed"
        stack_trap "umount $MOUNT2" EXIT
@@ -25905,8 +25905,8 @@ cleanup_test_432() {
 test_432() {
        local tmpdir=$TMP/dir432
 
-       (( $MDS1_VERSION >= $(version_code 2.14.0.7) )) ||
-               skip "Need MDS version at least 2.14.0.7"
+       (( $MDS1_VERSION >= $(version_code 2.12.6.47) )) ||
+               skip "Need MDS version at least 2.12.6.47"
 
        stack_trap cleanup_test_432 EXIT
        mkdir $DIR/$tdir
@@ -26737,8 +26737,8 @@ run_test 809 "Verify no SOM xattr store for DoM-only files"
 test_810() {
        [ $PARALLEL == "yes" ] && skip "skip parallel run"
        $GSS && skip_env "could not run with gss"
-       [[ $OST1_VERSION -gt $(version_code 2.12.58) ]] ||
-               skip "OST < 2.12.58 doesn't align checksum"
+       [[ $OST1_VERSION -gt $(version_code 2.12.3.11) ]] ||
+               skip "OST < 2.12.3.11 doesn't align checksum"
 
        set_checksums 1
        stack_trap "set_checksums $ORIG_CSUM" EXIT
@@ -26764,8 +26764,8 @@ test_810() {
 run_test 810 "partial page writes on ZFS (LU-11663)"
 
 test_812a() {
-       [ $OST1_VERSION -lt $(version_code 2.12.51) ] &&
-               skip "OST < 2.12.51 doesn't support this fail_loc"
+       [ $OST1_VERSION -lt $(version_code 2.12.3.1) ] &&
+               skip "OST < 2.12.3.1 doesn't support this fail_loc"
 
        $LFS setstripe -c 1 -i 0 $DIR/$tfile
        # ensure ost1 is connected