From 057e5747c9d2d0cf71f737a0b99c882c02ff9a39 Mon Sep 17 00:00:00 2001
From: Marc 'risson' Schmitt <marc.schmitt@risson.space>
Date: Tue, 9 Apr 2024 16:24:18 +0200
Subject: [PATCH] remove custom k6 install

Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
---
 Makefile                     |  7 +------
 tests/benchmark/login.js     |  2 --
 tests/benchmark/run.sh       | 10 ++++------
 tests/benchmark/user_list.js |  3 +--
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index eb143dd4bb..395f0b607b 100644
--- a/Makefile
+++ b/Makefile
@@ -283,11 +283,6 @@ ci-pending-migrations: ci--meta-debug
 ## Benchmark
 #########################
 
-benchmark-install:
-	go install go.k6.io/xk6/cmd/xk6@latest
-	$$(go env GOPATH)/bin/xk6 build latest --with github.com/grafana/xk6-exec@latest
-	mv k6 tests/benchmark/k6
-
 benchmark-fixtures-create:
 	tests/benchmark/fixtures.py create
 
@@ -299,4 +294,4 @@ benchmark-run:
 benchmark-fixtures-delete:
 	tests/benchmark/fixtures.py delete
 
-benchmark: benchmark-install benchmark-fixtures-create benchmark-run benchmark-fixtures-delete
+benchmark: benchmark-fixtures-create benchmark-run benchmark-fixtures-delete
diff --git a/tests/benchmark/login.js b/tests/benchmark/login.js
index 05ca75d4c9..475f69ad7d 100644
--- a/tests/benchmark/login.js
+++ b/tests/benchmark/login.js
@@ -1,6 +1,4 @@
-import { Counter } from "k6/metrics";
 import http from "k6/http";
-import exec from "k6/execution";
 import { check, fail } from "k6";
 
 export const options = {
diff --git a/tests/benchmark/run.sh b/tests/benchmark/run.sh
index ebb6d9dc2f..7faf25a747 100755
--- a/tests/benchmark/run.sh
+++ b/tests/benchmark/run.sh
@@ -10,12 +10,10 @@ function _k6 {
     K6_PROMETHEUS_RW_SERVER_URL=http://localhost:9090/api/v1/write \
     K6_PROMETHEUS_RW_TREND_AS_NATIVE_HISTOGRAM=true \
     K6_PROMETHEUS_RW_PUSH_INTERVAL=1s \
-    "${BASE_DIR}/k6" \
-        run \
-            --out experimental-prometheus-rw \
-            --out "web-dashboard=port=-1&report=${filename%.*}.html&period=1s&tag=name&tag=group&tag=user_count&tag=page_size" \
-            --out "json=${filename%.*}.json" \
-            "${@}"
+    k6 run \
+        --out experimental-prometheus-rw \
+        --out "json=${filename%.*}.json" \
+        "${@}"
 }
 
 filename=""
diff --git a/tests/benchmark/user_list.js b/tests/benchmark/user_list.js
index d1530b2ea0..cfa1ebfec2 100644
--- a/tests/benchmark/user_list.js
+++ b/tests/benchmark/user_list.js
@@ -1,7 +1,6 @@
 import exec from "k6/execution";
-import { command } from "k6/x/exec";
 import http from "k6/http";
-import { check, group } from "k6";
+import { check } from "k6";
 
 export const options = {
     discardResponseBodies: true,