From 19a84569fef58857a25c4c6d81a4044c08dadbea Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Thu, 30 Aug 2018 14:26:19 +0300 Subject: [PATCH 1/2] add compatibility with one Maxscale template to set_env.sh --- maxscale-system-test/mdbci/set_env.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/maxscale-system-test/mdbci/set_env.sh b/maxscale-system-test/mdbci/set_env.sh index 29ae8fe96..98cc748d2 100644 --- a/maxscale-system-test/mdbci/set_env.sh +++ b/maxscale-system-test/mdbci/set_env.sh @@ -80,15 +80,19 @@ do done done -export maxscale_access_user=$maxscale_000_whoami + export maxscale_access_sudo="sudo " # IP Of MaxScale machine -export maxscale_network=$maxscale_000_network -export maxscale_keyfile=$maxscale_000_keyfile -export maxscale_IP=$maxscale_000_network -export maxscale_sshkey=$maxscale_000_keyfile +if [ ${maxscale_N} > 1 ] ; then + export maxscale_whoami=$maxscale_000_whoami + export maxscale_network=$maxscale_000_network + export maxscale_keyfile=$maxscale_000_keyfile + export maxscale_sshkey=$maxscale_000_keyfile +fi +export maxscale_IP=$maxscale_network +export maxscale_access_user=$maxscale_whoami # Sysbench directory (should be sysbench >= 0.5) export sysbench_dir=${sysbench_dir:-"$HOME/sysbench_deb7/sysbench/"} From b2fea99dbcbd19bca2f48178cafbbe5992cc7bfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 31 Aug 2018 12:12:11 +0300 Subject: [PATCH 2/2] Fix set_env.sh The -gt operator should be used to compared numbers. --- maxscale-system-test/mdbci/set_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maxscale-system-test/mdbci/set_env.sh b/maxscale-system-test/mdbci/set_env.sh index 98cc748d2..75950f7fb 100644 --- a/maxscale-system-test/mdbci/set_env.sh +++ b/maxscale-system-test/mdbci/set_env.sh @@ -84,7 +84,7 @@ done export maxscale_access_sudo="sudo " # IP Of MaxScale machine -if [ ${maxscale_N} > 1 ] ; then +if [ ${maxscale_N} -gt 1 ] ; then export maxscale_whoami=$maxscale_000_whoami export maxscale_network=$maxscale_000_network export maxscale_keyfile=$maxscale_000_keyfile