fix: remove script

Signed-off-by: Vladislav Sukhin <[email protected]>
kubeshop · Jun 26, 2024 · 0d83a99 · 0d83a99
1 parent 2b1d524
commit 0d83a99
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/contrib/executor/jmeterd/build/slaves/Dockerfile b/contrib/executor/jmeterd/build/slaves/Dockerfile
@@ -8,6 +8,5 @@ EXPOSE 1099 60001
 ENV SSL_DISABLED true
 
 COPY ./contrib/executor/jmeterd/scripts/jmeter-slaves.sh /jmeter_slaves_entrypoint.sh
-COPY ./contrib/executor/jmeterd/scripts/jmeter-server.sh /jmeter-server.sh
 RUN chmod +x /jmeter_slaves_entrypoint.sh
 ENTRYPOINT /jmeter_slaves_entrypoint.sh
diff --git a/contrib/executor/jmeterd/pkg/slaves/utils.go b/contrib/executor/jmeterd/pkg/slaves/utils.go
@@ -20,6 +20,7 @@ const (
 	defaultSlavesCount = 0
 	serverPort         = 1099
 	localPort          = 60001
+	logFile            = "/logs/server.log"
 )
 
 func getSlaveRunnerEnv(envs map[string]string, runnerExecution testkube.Execution) []v1.EnvVar {
@@ -59,16 +60,23 @@ func getSlaveRunnerEnv(envs map[string]string, runnerExecution testkube.Executio
 
 func getSlaveConfigurationEnv(slaveEnv map[string]testkube.Variable, slavesPodNumber int) []v1.EnvVar {
 	var envVars []v1.EnvVar
+	found := false
 	for envKey, t := range slaveEnv {
 		if envKey == SlavesAdditionalJmeterArgs {
 			if !strings.Contains(t.Value, "-j") {
-				t.Value += " -j /logs/server.log"
+				t.Value += " -j " + logFile
 			}
+
+			found = true
 		}
 
 		envVars = append(envVars, v1.EnvVar{Name: envKey, Value: t.Value})
 	}
 
+	if !found {
+		envVars = append(envVars, v1.EnvVar{Name: SlavesAdditionalJmeterArgs, Value: " -j " + logFile})
+	}
+
 	envVars = append(envVars, v1.EnvVar{Name: "SLAVE_POD_NUMBER", Value: strconv.Itoa(slavesPodNumber)})
 	return envVars
 }

diff --git a/contrib/executor/jmeterd/scripts/jmeter-slaves.sh b/contrib/executor/jmeterd/scripts/jmeter-slaves.sh
@@ -51,7 +51,7 @@ echo "********************************************************"
 echo
 
 SERVER_ARGS="-Dserver.rmi.localport=60001 -Dserver_port=1099 -Jserver.rmi.ssl.disable=${SSL_DISABLED}"
-echo "Running command: jmeter-server ${SERVER_ARGS} ${SLAVES_ADDITIONAL_JMETER_ARGS}"
+echo "Running command: jmeter ${RMI_HOST_DEF} -s ${SERVER_ARGS} ${SLAVES_ADDITIONAL_JMETER_ARGS}"
 echo
 
-/jmeter-server.sh ${SERVER_ARGS} ${SLAVES_ADDITIONAL_JMETER_ARGS}
+jmeter ${RMI_HOST_DEF} -s ${SERVER_ARGS} ${SLAVES_ADDITIONAL_JMETER_ARGS}