LU-12275 tests: skip new nodemap params on old MGS

Skip setting forbid_encryption and readonly_mount parameters on old
MGSes that do not support these options.  Otherwise test_61 failures
are seen during interop testing.  Running test_36 would also fail in
this case, except that it is already skipped due to encryption checks.

Test-Parameters: trivial testlist=sanity-sec
Fixes: 598c48707c ("LU-12275 tests: exercise file content encryption/decryption")
Fixes: e7ce67de92 ("LU-15451 sec: read-only nodemap flag")
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I94f2e2f609927fea618a3a22f103bd32ae3ebbe5
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/49828
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Sebastien Buisson <sbuisson@ddn.com>
Reviewed-by: Alex Deiter <alex.deiter@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index 57f6ecd..3376269 100755 (executable)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -2675,7 +2675,7 @@ test_34() {
 run_test 34 "deny_unknown on default nodemap"
 
 test_35() {
-       [ $(lustre_version_code $SINGLEMDS) -ge $(version_code 2.13.50) ] ||
+       (( $MDS1_VERSION >= $(version_code 2.13.50) )) ||
                skip "Need MDS >= 2.13.50"
 
        # activate changelogs
@@ -2810,20 +2810,26 @@ cleanup_for_enc_tests() {
 cleanup_nodemap_after_enc_tests() {
        umount_client $MOUNT || true
 
-       do_facet mgs $LCTL nodemap_modify --name default \
-               --property forbid_encryption --value 0
-       do_facet mgs $LCTL nodemap_modify --name default \
-               --property readonly_mount --value 0 || true
+       if (( MGS_VERSION >= $(version_code 2.13.55) )); then
+               do_facet mgs $LCTL nodemap_modify --name default \
+                       --property forbid_encryption --value 0
+               if (( MGS_VERSION >= $(version_code 2.15.51) )); then
+                       do_facet mgs $LCTL nodemap_modify --name default \
+                               --property readonly_mount --value 0
+               fi
+       fi
        do_facet mgs $LCTL nodemap_modify --name default \
                --property trusted --value 0
        do_facet mgs $LCTL nodemap_modify --name default \
                --property admin --value 0
        do_facet mgs $LCTL nodemap_activate 0
 
-       wait_nm_sync default forbid_encryption '' inactive
-       [ -z "$(do_facet mgs \
-                       lctl get_param -n nodemap.default.readonly_mount)" ] ||
-               wait_nm_sync default readonly_mount '' inactive
+       if (( MGS_VERSION >= $(version_code 2.13.55) )); then
+               wait_nm_sync default forbid_encryption '' inactive
+               if (( MGS_VERSION >= $(version_code 2.15.51) )); then
+                       wait_nm_sync default readonly_mount '' inactive
+               fi
+       fi
        wait_nm_sync default trusted_nodemap '' inactive
        wait_nm_sync default admin_nodemap '' inactive
        wait_nm_sync active