From: Elena Gryaznova <elena.gryaznova@hpe.com>
Date: Tue, 26 Apr 2022 13:37:27 +0000 (+0300)
Subject: LU-15785 tests: do not detect versions for RPC_MODE mode
X-Git-Tag: 2.15.51~134
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=e3fcd81ae5f378ac62754a659c7adf0e0b656cf3

LU-15785 tests: do not detect versions for RPC_MODE mode

lustre_version_code() is called each time when do_rpc_nodes()
is called. It is not needed to detect versions for RPC_MODE mode.

Fixes: 8fa23490bb ("LU-1538 tests: standardize test script init - sanity")
Signed-off-by: Elena Gryaznova <elena.gryaznova@hpe.com>
HPE-bug-id: LUS-10914
Change-Id: Ia7645de0a4eedfddf859c80e661ebcb2e45de140
Reviewed-on: https://review.whamcloud.com/47144
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Vladimir Saveliev <vladimir.saveliev@hpe.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index d5c736b..f148131 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -156,14 +156,15 @@ print_summary () {
 # output: No return values, environment variables are exported
 
 get_lustre_env() {
+	if ! $RPC_MODE; then
+		export mds1_FSTYPE=${mds1_FSTYPE:-$(facet_fstype mds1)}
+		export ost1_FSTYPE=${ost1_FSTYPE:-$(facet_fstype ost1)}
 
-	export mds1_FSTYPE=${mds1_FSTYPE:-$(facet_fstype mds1)}
-	export ost1_FSTYPE=${ost1_FSTYPE:-$(facet_fstype ost1)}
-
-	export MGS_VERSION=$(lustre_version_code mgs)
-	export MDS1_VERSION=$(lustre_version_code mds1)
-	export OST1_VERSION=$(lustre_version_code ost1)
-	export CLIENT_VERSION=$(lustre_version_code client)
+		export MGS_VERSION=$(lustre_version_code mgs)
+		export MDS1_VERSION=$(lustre_version_code mds1)
+		export OST1_VERSION=$(lustre_version_code ost1)
+		export CLIENT_VERSION=$(lustre_version_code client)
+	fi
 
 	# Prefer using "mds1" directly instead of SINGLEMDS.
 	# Keep this for compat until it is removed from scripts.