LU-16868 tests: skip conf-sanity/32 in interop

Do not run conf-sanity.sh test_32* in interop testing.  Otherwise,
it is possible that the version of the test script running on the
client does not perform the upgrades with the right steps needed
for remote servers that are running a different version.

Test-Parameters: trivial testlist=conf-sanity env=ONLY=32a
Test-Parameters: testlist=conf-sanity env=ONLY=32a serverversion=2.12.9
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: Iabe1469a87d58c49e3c38b76ab18f8997f3ebbe5

diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh
index e83a681..7af7b15 100644 (file)
--- a/lustre/tests/conf-sanity.sh
+++ b/lustre/tests/conf-sanity.sh
@@ -1634,6 +1634,8 @@ test_32newtarball() {
 t32_check() {
        [ "$CLIENTONLY" ] && skip "Client-only testing"
 
+       check_versions || skip "do not upgrade with mismatched client/server"
+
        local node=$(facet_active_host $SINGLEMDS)
        local r="do_node $node"
 
@@ -2045,21 +2047,25 @@ t32_test() {
                fi
                $r $MOUNT_CMD -o $mopts $mdt_dev $tmp/mnt/mdt
                $r $LCTL replace_nids $fsname-OST0000 $ostnid || {
+                       $r $LCTL dl
                        error_noexit "replace_nids $fsname-OST0000 $ostnid failed"
                        return 1
                }
                if $ost2_is_available; then
                        $r $LCTL replace_nids $fsname-OST0001 $ostnid || {
+                               $r $LCTL dl
                                error_noexit "replace_nids $fsname-OST0001 $ostnid failed"
                                return 1
                        }
                fi
                $r $LCTL replace_nids $fsname-MDT0000 $nid || {
+                       $r $LCTL dl
                        error_noexit "replace_nids $fsname-MDT0000 $nid failed"
                        return 1
                }
                if $mdt2_is_available; then
                        $r $LCTL replace_nids $fsname-MDT0001 $nid || {
+                               $r $LCTL dl
                                error_noexit "replace_nids $fsname-MDT0001 $nid failed"
                                return 1
                        }

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 22e8615..2d85020 100755 (executable)
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -7598,8 +7598,17 @@ client_only () {
 }
 
 check_versions () {
-    [ "$(lustre_version_code client)" = "$(lustre_version_code $SINGLEMDS)" -a \
-      "$(lustre_version_code client)" = "$(lustre_version_code ost1)" ]
+       # this should already have been called, but just in case
+       [[ -n "$CLIENT_VERSION" && -n "$MDS1_VERSION" && -n "$OST1_VERSION" ]]||
+               get_lustre_env
+
+       echo "client=$CLIENT_VERSION MDS=$MDS1_VERSION OSS=$OST1_VERSION"
+
+       [[ -n "$CLIENT_VERSION" && -n "$MDS1_VERSION" && -n "$OST1_VERSION" ]]||
+               error "unable to determine node versions"
+
+       (( "$CLIENT_VERSION" == "$MDS1_VERSION" &&
+          "$CLIENT_VERSION" == "$OST1_VERSION"))
 }
 
 get_node_count() {