diff --git a/.github/workflows/grafana-bench.yml b/.github/workflows/grafana-bench.yml index 04b0ed0a..3cc23ece 100644 --- a/.github/workflows/grafana-bench.yml +++ b/.github/workflows/grafana-bench.yml @@ -52,14 +52,15 @@ jobs: run: | docker run --rm \ --network=host \ - --volume="./:/home/bench/tests/" \ - ghcr.io/grafana/grafana-bench:v0.2.4 test \ - --test-suite-base "/home/bench/tests/" \ + --volume="./:/home/bench/tests/" \ + us-docker.pkg.dev/grafanalabs-global/docker-grafana-bench-prod/grafana-bench:v0.3.0-rc3 test \ + --grafana-admin-password "admin" \ + --grafana-admin-user "admin" \ --grafana-url "http://localhost:3000" \ - --grafana-username "admin" \ - --grafana-password "admin" \ - --test-runner "playwright" \ - --pw-prepare-cmd "yarn e2e:prepare" \ - --pw-execute-cmd "yarn e2e" \ --log-level DEBUG + --pw-execute-cmd "yarn e2e" \ + --pw-prepare-cmd "yarn e2e:prepare" \ + --test-env-vars "CI=true" + --test-runner "playwright" \ + --test-suite-base "/home/bench/tests/" \ diff --git a/package.json b/package.json index 2da714e9..7e49ee53 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "scripts": { "build": "webpack -c ./.config/webpack/webpack.config.ts --env production", "dev": "webpack -w -c ./.config/webpack/webpack.config.ts --env development", - "e2e:prepare": "yarn install --frozen-lockfile && yarn playwright install --with-deps", + "e2e:prepare": "yarn install --frozen-lockfile && yarn playwright install", "e2e:report": "yarn playwright show-report", "e2e:ui": "yarn playwright test --ui", "e2e": "playwright test", diff --git a/playwright.config.ts b/playwright.config.ts index 73e85542..cf458f03 100644 --- a/playwright.config.ts +++ b/playwright.config.ts @@ -28,11 +28,6 @@ export default defineConfig({ /* Base URL to use in actions like `await page.goto('/')`. */ baseURL: process.env.GRAFANA_URL || `http://localhost:${process.env.PORT || 3000}`, - grafanaAPICredentials: { - user: process.env.GRAFANA_USER || 'admin', - password: process.env.GRAFANA_PASSWORD || 'admin', - }, - launchOptions: { executablePath: process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH, },