wip: Remove sirun, add verbosity

Author: ddyurchenko

benchmark/load/insecure-bank/benchmark.json

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eu
+
+set -exu
 
 start_server() {
   local VARIANT=$1
@@ -16,7 +17,7 @@ start_server() {
   ${CPU_AFFINITY_APP}java ${JAVA_OPTS} -Xms3G -Xmx3G -jar ${INSECURE_BANK} &> ${OUTPUT_DIR}/${VARIANT}/insecure-bank.log
 }
 
-start_server "${NO_AGENT_VARIANT}" "-Dserver.port=8080" "taskset -c 47 " &
+start_server "no_agent" "-Dserver.port=8080" "taskset -c 47 " &
 start_server "tracing" "-javaagent:${TRACER} -Dserver.port=8081" "taskset -c 46 " &
 start_server "profiling" "-javaagent:${TRACER} -Ddd.profiling.enabled=true -Dserver.port=8082" "taskset -c 45 " &
 start_server "iast" "-javaagent:${TRACER} -Ddd.iast.enabled=true -Dserver.port=8083" "taskset -c 44 " &

benchmark/load/insecure-bank/start-servers.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eu
+
+set -exu
 
 start_server() {
   local VARIANT=$1
@@ -16,7 +17,7 @@ start_server() {
   ${CPU_AFFINITY_APP}java ${JAVA_OPTS} -Xms2G -Xmx2G -jar ${PETCLINIC} &> ${OUTPUT_DIR}/${VARIANT}/petclinic.log
 }
 
-start_server "${NO_AGENT_VARIANT}" "-Dserver.port=8080" "taskset -c 31-32 " &
+start_server "no_agent" "-Dserver.port=8080" "taskset -c 31-32 " &
 start_server "tracing" "-javaagent:${TRACER} -Dserver.port=8081" "taskset -c 33-34 " &
 start_server "profiling" "-javaagent:${TRACER} -Ddd.profiling.enabled=true -Dserver.port=8082" "taskset -c 35-36 " &
 start_server "appsec" "-javaagent:${TRACER} -Ddd.appsec.enabled=true -Dserver.port=8083" "taskset -c 37-38 " &

benchmark/load/petclinic/benchmark.json

@@ -1,23 +1,29 @@
 #!/usr/bin/env bash
-set -eu
+
+set -exu
+
+local type=$1
+local app=$2
+
+export OUTPUT_DIR="${REPORTS_DIR}/${type}/${app}"
 
 if [ -n "$CI_JOB_TOKEN" ]; then
-  # Inside BP, so we can assume 24 CPU cores available and set CPU affinity
-  export CPU_AFFINITY_K6="taskset -c 25-26 "
-  export CPU_AFFINITY_APP="taskset -c 27-47 "
+  # Inside BP, so we can assume 24 CPU cores on the second socket available and set CPU affinity
+  export CPU_AFFINITY_K6="taskset -c 24-30 "
 else
   export CPU_AFFINITY_K6=""
-  export CPU_AFFINITY_APP=""
 fi
 
-
 source "${UTILS_DIR}/update-java-version.sh" 17
 
-if [ -n "$CI_JOB_TOKEN" ]; then
-  # Inside BP, so we can assume 24 CPU cores available and set CPU affinity
-  export CPU_AFFINITY_K6="taskset -c 24-30 "
+if [ "${app}" == "petclinic" ]; then
+  HEALTHCHECK_URL=http://localhost:8080
+elif [ "${app}" == "insecure-bank" ]; then
+  HEALTHCHECK_URL=http://localhost:8080/login
 else
-  export CPU_AFFINITY_K6=""
+  echo "Unknown app ${app}"
+  exit 1
 fi
 
-"${UTILS_DIR}/run-sirun-benchmarks.sh" "$@"
+bash -c "${UTILS_DIR}/../${type}/${app}/start-servers.sh"
+bash -c "${CPU_AFFINITY_K6}${UTILS_DIR}/run-k6-load-test.sh ${HEALTHCHECK_URL} ${OUTPUT_DIR} 'pkill java'"