IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Chore: Install Playwright deps manually (#86008)

Browse Source 
* install deps manually

* use ubuntu image

* regenerate drone file

* use node bookworm image

* get node major version from variable and wait for grafana server to be ready
This commit is contained in:
Erik Sundell
2024-04-15 14:19:37 +02:00
committed by GitHub
parent 6fb13842a5
commit ad8d505d81
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.drone.yml
View File

@@ -658,7 +658,8 @@ steps:
repo:
- grafana/grafana
- commands:
- sleep 10s
- npx wait-on@7.0.1 http://$HOST:$PORT
- yarn playwright install --with-deps chromium
- yarn e2e:playwright
depends_on:
- grafana-server
@@ -666,7 +667,7 @@ steps:
HOST: grafana-server
PORT: "3001"
PROV_DIR: /grafana/scripts/grafana-server/tmp/conf/provisioning
image: mcr.microsoft.com/playwright:v1.43.0-jammy
image: node:20-bookworm
name: playwright-plugin-e2e
- commands:
- apt-get update
@@ -1988,7 +1989,8 @@ steps:
repo:
- grafana/grafana
- commands:
- sleep 10s
- npx wait-on@7.0.1 http://$HOST:$PORT
- yarn playwright install --with-deps chromium
- yarn e2e:playwright
depends_on:
- grafana-server
@@ -1996,7 +1998,7 @@ steps:
HOST: grafana-server
PORT: "3001"
PROV_DIR: /grafana/scripts/grafana-server/tmp/conf/provisioning
image: mcr.microsoft.com/playwright:v1.43.0-jammy
image: node:20-bookworm
name: playwright-plugin-e2e
- commands:
- apt-get update
@@ -4635,6 +4637,7 @@ steps:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.9-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20.9.0-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:20-bookworm
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine:3.19.1
@@ -4656,7 +4659,6 @@ steps:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM cypress/included:13.1.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM jwilder/dockerize:0.6.1
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM koalaman/shellcheck:stable
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM mcr.microsoft.com/playwright:v1.43.0-jammy
depends_on:
- authenticate-gcr
image: aquasec/trivy:0.21.0
@@ -4670,6 +4672,7 @@ steps:
- trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.9-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:20.9.0-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:20-bookworm
- trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
- trivy --exit-code 1 --severity HIGH,CRITICAL alpine:3.19.1
@@ -4691,7 +4694,6 @@ steps:
- trivy --exit-code 1 --severity HIGH,CRITICAL cypress/included:13.1.0
- trivy --exit-code 1 --severity HIGH,CRITICAL jwilder/dockerize:0.6.1
- trivy --exit-code 1 --severity HIGH,CRITICAL koalaman/shellcheck:stable
- trivy --exit-code 1 --severity HIGH,CRITICAL mcr.microsoft.com/playwright:v1.43.0-jammy
depends_on:
- authenticate-gcr
environment:
@@ -4923,6 +4925,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: 2f4db495ad0b69ef6afd86eac7aea7101f0b8f6ec1aadea0e2860b196304a258
hmac: fbd59890dac44eb6fb34562f2b2b2db0fc0a8a50d451f9887f815ee35757e0f6
...

5
scripts/drone/steps/lib.star
View File

@@ -853,12 +853,13 @@ def playwright_e2e_tests_step():
"PROV_DIR": "/grafana/scripts/grafana-server/tmp/conf/provisioning",
},
"name": "playwright-plugin-e2e",
"image": images["playwright"],
"image": images["node_deb"],
"depends_on": [
"grafana-server",
],
"commands": [
"sleep 10s", # it seems sometimes that grafana-server is not actually ready when the step starts, so waiting for a few seconds before running the tests
"npx wait-on@7.0.1 http://$HOST:$PORT",
"yarn playwright install --with-deps chromium",
"yarn e2e:playwright",
],
}

2
scripts/drone/utils/images.star
View File

@@ -12,6 +12,7 @@ images = {
"git": "alpine/git:2.40.1",
"go": "golang:{}-alpine".format(golang_version),
"node": "node:{}-alpine".format(nodejs_version),
"node_deb": "node:{}-bookworm".format(nodejs_version[:2]),
"cloudsdk": "google/cloud-sdk:431.0.0",
"publish": "grafana/grafana-ci-deploy:1.3.3",
"alpine": "alpine:3.19.1",
@@ -33,5 +34,4 @@ images = {
"cypress": "cypress/included:13.1.0",
"dockerize": "jwilder/dockerize:0.6.1",
"shellcheck": "koalaman/shellcheck:stable",
"playwright": "mcr.microsoft.com/playwright:v1.43.0-jammy",
}