clean up results json files

mafredri · mafredri · commit 047c7840e545 · 2023-09-14T16:03:09.000Z
diff --git a/scaletest/templates/scaletest-runner/main.tf b/scaletest/templates/scaletest-runner/main.tf
@@ -213,6 +213,7 @@ data "archive_file" "scripts_zip" {
 
 resource "coder_agent" "main" {
   arch = data.coder_provisioner.me.arch
+  dir  = local.scaletest_run_dir
   os   = "linux"
   env = {
     VERBOSE : data.coder_parameter.verbose.value ? "1" : "0",
diff --git a/scaletest/templates/scaletest-runner/scripts/cleanup.sh b/scaletest/templates/scaletest-runner/scripts/cleanup.sh
@@ -25,7 +25,7 @@ start_phase "Cleanup (${event})"
 coder exp scaletest cleanup \
 	--cleanup-job-timeout 15m \
 	--cleanup-timeout 30m |
-	tee "result-cleanup-${event}.txt"
+	tee "${SCALETEST_RESULTS_DIR}/cleanup-${event}.txt"
 end_phase
 
 if [[ $event = manual ]]; then
diff --git a/scaletest/templates/scaletest-runner/scripts/lib.sh b/scaletest/templates/scaletest-runner/scripts/lib.sh
@@ -14,6 +14,7 @@ fi
 # Environment variables shared between scripts.
 SCALETEST_STATE_DIR="${SCALETEST_RUN_DIR}/state"
 SCALETEST_PHASE_FILE="${SCALETEST_STATE_DIR}/phase"
+SCALETEST_RESULTS_DIR="${SCALETEST_RUN_DIR}/results"
 
 coder() {
 	maybedryrun "$DRY_RUN" command coder "${@}"
diff --git a/scaletest/templates/scaletest-runner/scripts/prepare.sh b/scaletest/templates/scaletest-runner/scripts/prepare.sh
@@ -7,6 +7,7 @@ set -euo pipefail
 . "${SCRIPTS_DIR}/lib.sh"
 
 mkdir -p "${SCALETEST_STATE_DIR}"
+mkdir -p "${SCALETEST_RESULTS_DIR}"
 
 echo "Preparing scaletest workspace environment..."
 set_status Preparing
diff --git a/scaletest/templates/scaletest-runner/scripts/run.sh b/scaletest/templates/scaletest-runner/scripts/run.sh
@@ -16,8 +16,8 @@ coder exp scaletest create-workspaces \
 	--concurrency "${SCALETEST_CREATE_CONCURRENCY}" \
 	--job-timeout 15m \
 	--no-cleanup \
-	--output json:"${SCALETEST_RUN_DIR}/result-create-workspaces.json"
-show_json "${SCALETEST_RUN_DIR}/result-create-workspaces.json"
+	--output json:"${SCALETEST_RESULTS_DIR}/create-workspaces.json"
+show_json "${SCALETEST_RESULTS_DIR}/create-workspaces.json"
 end_phase
 
 wait_baseline 5
@@ -28,8 +28,8 @@ coder exp scaletest workspace-traffic \
 	--bytes-per-tick 10240 \
 	--tick-interval 1s \
 	--timeout 5m \
-	--output json:"${SCALETEST_RUN_DIR}/result-ssh.json"
-show_json "${SCALETEST_RUN_DIR}/result-ssh.json"
+	--output json:"${SCALETEST_RESULTS_DIR}/traffic-ssh.json"
+show_json "${SCALETEST_RESULTS_DIR}/traffic-ssh.json"
 end_phase
 
 wait_baseline 5
@@ -39,8 +39,8 @@ coder exp scaletest workspace-traffic \
 	--bytes-per-tick 10240 \
 	--tick-interval 1s \
 	--timeout 5m \
-	--output json:"${SCALETEST_RUN_DIR}/result-reconnectingpty.json"
-show_json "${SCALETEST_RUN_DIR}/result-reconnectingpty.json"
+	--output json:"${SCALETEST_RESULTS_DIR}/traffic-reconnectingpty.json"
+show_json "${SCALETEST_RESULTS_DIR}/traffic-reconnectingpty.json"
 end_phase
 
 wait_baseline 5
@@ -49,8 +49,8 @@ start_phase "Dashboard traffic"
 coder exp scaletest dashboard \
 	--count "${SCALETEST_NUM_WORKSPACES}" \
 	--job-timeout 5m \
-	--output json:"${SCALETEST_RUN_DIR}/result-dashboard.json"
-show_json "${SCALETEST_RUN_DIR}/result-dashboard.json"
+	--output json:"${SCALETEST_RESULTS_DIR}/traffic-dashboard.json"
+show_json "${SCALETEST_RESULTS_DIR}/traffic-dashboard.json"
 end_phase
 
 wait_baseline 5
