From 05b07e8b7b5fc18533014071a8411d1cb95a3a17 Mon Sep 17 00:00:00 2001
From: Matej Korosec <matej.korosec@bearingpoint.com>
Date: Thu, 1 Sep 2022 09:56:51 +0200
Subject: [PATCH] support passing parameters to start_test.sh

---
 jmeter_master_configmap.yaml | 2 +-
 start_test.sh                | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/jmeter_master_configmap.yaml b/jmeter_master_configmap.yaml
index 050560e..dbd064a 100644
--- a/jmeter_master_configmap.yaml
+++ b/jmeter_master_configmap.yaml
@@ -9,4 +9,4 @@ data:
     #!/bin/bash
     #Script created to invoke jmeter test script with the slave POD IP addresses
     #Script should be run like: ./load_test "path to the test script in jmx format"
-    /jmeter/apache-jmeter-*/bin/jmeter -n -t $1 -Dserver.rmi.ssl.disable=true -R `getent ahostsv4 jmeter-slaves-svc | cut -d' ' -f1 | sort -u | awk -v ORS=, '{print $1}' | sed 's/,$//'`
+    /jmeter/apache-jmeter-*/bin/jmeter -n -t $1 -Dserver.rmi.ssl.disable=true -R `getent ahostsv4 jmeter-slaves-svc | cut -d' ' -f1 | sort -u | awk -v ORS=, '{print $1}' | sed 's/,$//'` ${@:2}
diff --git a/start_test.sh b/start_test.sh
index 815840b..7ec0950 100755
--- a/start_test.sh
+++ b/start_test.sh
@@ -9,7 +9,9 @@ working_dir="`pwd`"
 tenant=`awk '{print $NF}' "$working_dir/tenant_export"`
 
 jmx="$1"
+params="${@:2}"
 [ -n "$jmx" ] || read -p 'Enter path to the jmx file ' jmx
+[ -n "$params" ] || read -p 'Enter additional CLI parameters (like -Jparam1=value) ' params
 
 if [ ! -f "$jmx" ];
 then
@@ -19,6 +21,8 @@ then
 fi
 
 test_name="$(basename "$jmx")"
+echo "Using test file: $test_name"
+echo "Additional parameters for jmeter: $params"
 
 #Get Master pod details
 
@@ -28,4 +32,4 @@ kubectl cp "$jmx" -n $tenant "$master_pod:/$test_name"
 
 ## Echo Starting Jmeter load test
 
-kubectl exec -ti -n $tenant $master_pod -- /bin/bash /load_test "$test_name"
+kubectl exec -ti -n $tenant $master_pod -- /bin/bash /load_test "$test_name" $params