remove custom k6 install
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
This commit is contained in:
		
							
								
								
									
										7
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										7
									
								
								Makefile
									
									
									
									
									
								
							| @ -283,11 +283,6 @@ ci-pending-migrations: ci--meta-debug | |||||||
| ## Benchmark | ## 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: | benchmark-fixtures-create: | ||||||
| 	tests/benchmark/fixtures.py create | 	tests/benchmark/fixtures.py create | ||||||
|  |  | ||||||
| @ -299,4 +294,4 @@ benchmark-run: | |||||||
| benchmark-fixtures-delete: | benchmark-fixtures-delete: | ||||||
| 	tests/benchmark/fixtures.py 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 | ||||||
|  | |||||||
| @ -1,6 +1,4 @@ | |||||||
| import { Counter } from "k6/metrics"; |  | ||||||
| import http from "k6/http"; | import http from "k6/http"; | ||||||
| import exec from "k6/execution"; |  | ||||||
| import { check, fail } from "k6"; | import { check, fail } from "k6"; | ||||||
|  |  | ||||||
| export const options = { | export const options = { | ||||||
|  | |||||||
| @ -10,10 +10,8 @@ function _k6 { | |||||||
|     K6_PROMETHEUS_RW_SERVER_URL=http://localhost:9090/api/v1/write \ |     K6_PROMETHEUS_RW_SERVER_URL=http://localhost:9090/api/v1/write \ | ||||||
|     K6_PROMETHEUS_RW_TREND_AS_NATIVE_HISTOGRAM=true \ |     K6_PROMETHEUS_RW_TREND_AS_NATIVE_HISTOGRAM=true \ | ||||||
|     K6_PROMETHEUS_RW_PUSH_INTERVAL=1s \ |     K6_PROMETHEUS_RW_PUSH_INTERVAL=1s \ | ||||||
|     "${BASE_DIR}/k6" \ |     k6 run \ | ||||||
|         run \ |  | ||||||
|         --out experimental-prometheus-rw \ |         --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" \ |         --out "json=${filename%.*}.json" \ | ||||||
|         "${@}" |         "${@}" | ||||||
| } | } | ||||||
|  | |||||||
| @ -1,7 +1,6 @@ | |||||||
| import exec from "k6/execution"; | import exec from "k6/execution"; | ||||||
| import { command } from "k6/x/exec"; |  | ||||||
| import http from "k6/http"; | import http from "k6/http"; | ||||||
| import { check, group } from "k6"; | import { check } from "k6"; | ||||||
|  |  | ||||||
| export const options = { | export const options = { | ||||||
|     discardResponseBodies: true, |     discardResponseBodies: true, | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user
	 Marc 'risson' Schmitt
					Marc 'risson' Schmitt