apitech
/
grafana
mirror of https://github.com/grafana/grafana
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

E2E: Rename `end-to-end-tests-server` to `grafana-server` (#44249)

Browse Source 
* Rename to grafana-server / move scripts into new directory

* Change grafana-server step command

* Change scripts paths

* Use test grabpl version

* Update run-suite script

* Further name updates

* Update grabpl version

* Update contribute/style-guides/e2e-core.md

Co-authored-by: Maria Alexandra <239999+axelavargas@users.noreply.github.com>

Co-authored-by: Maria Alexandra <239999+axelavargas@users.noreply.github.com>
pull/44225/head
Dimitris Sotirakis 3 years ago committed by GitHub
parent 9ccc7ec76e
commit 22eb2df602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 108 additions and 102 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 156
      .drone.yml
  2. 1
      .eslintignore
  3. 4
      .gitignore
  4. 1
      .prettierignore
  5. 4
      contribute/style-guides/e2e-core.md
  6. 2
      e2e/run-suite
  7. 6
      e2e/start-and-run-suite
  8. 2
      e2e/verify-release
  9. 16
      scripts/drone/steps/lib.star
  10. 4
      scripts/generate-a11y-report.sh
  11. 0
      scripts/grafana-server/custom.ini
  12. 4
      scripts/grafana-server/kill-server
  13. 6
      scripts/grafana-server/start-server
  14. 2
      scripts/grafana-server/variables
  15. 2
      scripts/grafana-server/wait-for-grafana

156
.drone.yml
Unescape View File

@ -11,7 +11,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -111,7 +111,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -187,21 +187,21 @@ steps:
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: package name: package
- commands: - commands:
- ./e2e/start-server - ./scripts/grafana-server/start-server
depends_on: depends_on:
- package - package
detach: true detach: true
environment: environment:
PORT: 3001 PORT: 3001
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: end-to-end-tests-server name: grafana-server
- commands: - commands:
- apt-get install -y netcat - apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite name: end-to-end-tests-dashboards-suite
- commands: - commands:
@ -210,7 +210,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite name: end-to-end-tests-smoke-tests-suite
- commands: - commands:
@ -219,7 +219,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite name: end-to-end-tests-panels-suite
- commands: - commands:
@ -228,7 +228,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-various-suite name: end-to-end-tests-various-suite
- commands: - commands:
@ -276,11 +276,11 @@ steps:
- yarn wait-on http://$HOST:$PORT - yarn wait-on http://$HOST:$PORT
- pa11y-ci --config .pa11yci-pr.conf.js - pa11y-ci --config .pa11yci-pr.conf.js
depends_on: depends_on:
- end-to-end-tests-server - grafana-server
environment: environment:
GRAFANA_MISC_STATS_API_KEY: GRAFANA_MISC_STATS_API_KEY:
from_secret: grafana_misc_stats_api_key from_secret: grafana_misc_stats_api_key
HOST: end-to-end-tests-server HOST: grafana-server
PORT: 3001 PORT: 3001
failure: always failure: always
image: grafana/docker-puppeteer:1.0.0 image: grafana/docker-puppeteer:1.0.0
@ -356,7 +356,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -417,7 +417,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -518,7 +518,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -617,21 +617,21 @@ steps:
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: package name: package
- commands: - commands:
- ./e2e/start-server - ./scripts/grafana-server/start-server
depends_on: depends_on:
- package - package
detach: true detach: true
environment: environment:
PORT: 3001 PORT: 3001
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: end-to-end-tests-server name: grafana-server
- commands: - commands:
- apt-get install -y netcat - apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite name: end-to-end-tests-dashboards-suite
- commands: - commands:
@ -640,7 +640,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite name: end-to-end-tests-smoke-tests-suite
- commands: - commands:
@ -649,7 +649,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite name: end-to-end-tests-panels-suite
- commands: - commands:
@ -658,7 +658,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-various-suite name: end-to-end-tests-various-suite
- commands: - commands:
@ -723,11 +723,11 @@ steps:
- yarn wait-on http://$HOST:$PORT - yarn wait-on http://$HOST:$PORT
- pa11y-ci --config .pa11yci.conf.js --json > pa11y-ci-results.json - pa11y-ci --config .pa11yci.conf.js --json > pa11y-ci-results.json
depends_on: depends_on:
- end-to-end-tests-server - grafana-server
environment: environment:
GRAFANA_MISC_STATS_API_KEY: GRAFANA_MISC_STATS_API_KEY:
from_secret: grafana_misc_stats_api_key from_secret: grafana_misc_stats_api_key
HOST: end-to-end-tests-server HOST: grafana-server
PORT: 3001 PORT: 3001
failure: ignore failure: ignore
image: grafana/docker-puppeteer:1.0.0 image: grafana/docker-puppeteer:1.0.0
@ -808,7 +808,7 @@ steps:
- commands: - commands:
- ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets"
depends_on: depends_on:
- end-to-end-tests-server - grafana-server
environment: environment:
GCP_GRAFANA_UPLOAD_KEY: GCP_GRAFANA_UPLOAD_KEY:
from_secret: gcp_key from_secret: gcp_key
@ -864,7 +864,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -932,7 +932,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/windows/grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/windows/grabpl.exe
-OutFile grabpl.exe -OutFile grabpl.exe
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
name: initialize name: initialize
@ -1015,7 +1015,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -1098,7 +1098,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -1224,21 +1224,21 @@ steps:
- name: docker - name: docker
path: /var/run/docker.sock path: /var/run/docker.sock
- commands: - commands:
- ./e2e/start-server - ./scripts/grafana-server/start-server
depends_on: depends_on:
- package - package
detach: true detach: true
environment: environment:
PORT: 3001 PORT: 3001
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: end-to-end-tests-server name: grafana-server
- commands: - commands:
- apt-get install -y netcat - apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite name: end-to-end-tests-dashboards-suite
- commands: - commands:
@ -1247,7 +1247,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite name: end-to-end-tests-smoke-tests-suite
- commands: - commands:
@ -1256,7 +1256,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite name: end-to-end-tests-panels-suite
- commands: - commands:
@ -1265,7 +1265,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-various-suite name: end-to-end-tests-various-suite
- commands: - commands:
@ -1312,7 +1312,7 @@ steps:
- commands: - commands:
- ./bin/grabpl upload-cdn --edition oss --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets" - ./bin/grabpl upload-cdn --edition oss --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets"
depends_on: depends_on:
- end-to-end-tests-server - grafana-server
environment: environment:
GCP_GRAFANA_UPLOAD_KEY: GCP_GRAFANA_UPLOAD_KEY:
from_secret: gcp_key from_secret: gcp_key
@ -1402,7 +1402,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -1523,7 +1523,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -1607,7 +1607,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/windows/grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/windows/grabpl.exe
-OutFile grabpl.exe -OutFile grabpl.exe
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
name: initialize name: initialize
@ -1666,7 +1666,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -1826,23 +1826,23 @@ steps:
- name: docker - name: docker
path: /var/run/docker.sock path: /var/run/docker.sock
- commands: - commands:
- ./e2e/start-server - ./scripts/grafana-server/start-server
depends_on: depends_on:
- package - package
detach: true detach: true
environment: environment:
PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz
PORT: 3001 PORT: 3001
RUNDIR: e2e/tmp-grafana-enterprise RUNDIR: scripts/grafana-server/tmp-grafana-enterprise
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: end-to-end-tests-server name: grafana-server
- commands: - commands:
- apt-get install -y netcat - apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite name: end-to-end-tests-dashboards-suite
- commands: - commands:
@ -1851,7 +1851,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite name: end-to-end-tests-smoke-tests-suite
- commands: - commands:
@ -1860,7 +1860,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite name: end-to-end-tests-panels-suite
- commands: - commands:
@ -1869,7 +1869,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-various-suite name: end-to-end-tests-various-suite
- commands: - commands:
@ -2006,7 +2006,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2179,7 +2179,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2307,7 +2307,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/windows/grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/windows/grabpl.exe
-OutFile grabpl.exe -OutFile grabpl.exe
- git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@ -2382,7 +2382,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2460,7 +2460,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2521,7 +2521,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2599,7 +2599,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2661,7 +2661,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2697,7 +2697,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2744,7 +2744,7 @@ steps:
name: initialize name: initialize
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2792,7 +2792,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2857,7 +2857,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -2980,21 +2980,21 @@ steps:
- name: docker - name: docker
path: /var/run/docker.sock path: /var/run/docker.sock
- commands: - commands:
- ./e2e/start-server - ./scripts/grafana-server/start-server
depends_on: depends_on:
- package - package
detach: true detach: true
environment: environment:
PORT: 3001 PORT: 3001
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: end-to-end-tests-server name: grafana-server
- commands: - commands:
- apt-get install -y netcat - apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite name: end-to-end-tests-dashboards-suite
- commands: - commands:
@ -3003,7 +3003,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite name: end-to-end-tests-smoke-tests-suite
- commands: - commands:
@ -3012,7 +3012,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite name: end-to-end-tests-panels-suite
- commands: - commands:
@ -3021,7 +3021,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-various-suite name: end-to-end-tests-various-suite
- commands: - commands:
@ -3068,7 +3068,7 @@ steps:
- commands: - commands:
- ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets" - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets"
depends_on: depends_on:
- end-to-end-tests-server - grafana-server
environment: environment:
GCP_GRAFANA_UPLOAD_KEY: GCP_GRAFANA_UPLOAD_KEY:
from_secret: gcp_key from_secret: gcp_key
@ -3117,7 +3117,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -3231,7 +3231,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -3308,7 +3308,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/windows/grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/windows/grabpl.exe
-OutFile grabpl.exe -OutFile grabpl.exe
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
name: initialize name: initialize
@ -3356,7 +3356,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -3510,23 +3510,23 @@ steps:
- name: docker - name: docker
path: /var/run/docker.sock path: /var/run/docker.sock
- commands: - commands:
- ./e2e/start-server - ./scripts/grafana-server/start-server
depends_on: depends_on:
- package - package
detach: true detach: true
environment: environment:
PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz
PORT: 3001 PORT: 3001
RUNDIR: e2e/tmp-grafana-enterprise RUNDIR: scripts/grafana-server/tmp-grafana-enterprise
image: grafana/build-container:1.4.9 image: grafana/build-container:1.4.9
name: end-to-end-tests-server name: grafana-server
- commands: - commands:
- apt-get install -y netcat - apt-get install -y netcat
- ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3 - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-dashboards-suite name: end-to-end-tests-dashboards-suite
- commands: - commands:
@ -3535,7 +3535,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-smoke-tests-suite name: end-to-end-tests-smoke-tests-suite
- commands: - commands:
@ -3544,7 +3544,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-panels-suite name: end-to-end-tests-panels-suite
- commands: - commands:
@ -3553,7 +3553,7 @@ steps:
depends_on: depends_on:
- package - package
environment: environment:
HOST: end-to-end-tests-server HOST: grafana-server
image: cypress/included:9.2.0 image: cypress/included:9.2.0
name: end-to-end-tests-various-suite name: end-to-end-tests-various-suite
- commands: - commands:
@ -3693,7 +3693,7 @@ services: []
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -3858,7 +3858,7 @@ services:
steps: steps:
- commands: - commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
image: byrnedo/alpine-curl:0.1.8 image: byrnedo/alpine-curl:0.1.8
name: grabpl name: grabpl
@ -3978,7 +3978,7 @@ steps:
name: identify-runner name: identify-runner
- commands: - commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.4/windows/grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.8.5/windows/grabpl.exe
-OutFile grabpl.exe -OutFile grabpl.exe
- git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git" - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@ -4175,6 +4175,6 @@ kind: secret
name: gcp_upload_artifacts_key name: gcp_upload_artifacts_key
--- ---
kind: signature kind: signature
hmac: 00de7a9339c4f19716c6edb0ad6578aaff95e5850cc7c1035d1cdf71c80af283 hmac: 1ee4baacef44b7189c4a2367166c8f2566baf142e027bf39d62b0886f3846855
... ...

1
.eslintignore
Unescape View File

@ -6,6 +6,7 @@ devenv
data data
dist dist
e2e/tmp e2e/tmp
scripts/grafana-server/tmp
public/lib/monaco public/lib/monaco
deployment_tools_config.json deployment_tools_config.json

4
.gitignore vendored
Unescape View File

@ -13,6 +13,7 @@ public/dist/tsconfig.tsbuildinfo
/emails/dist /emails/dist
/reports /reports
/e2e/tmp /e2e/tmp
/scripts/grafana-server/tmp
vendor/ vendor/
/docs/menu.yaml /docs/menu.yaml
/requests /requests
@ -140,6 +141,9 @@ compilation-stats.json
/e2e/benchmarks/**/results /e2e/benchmarks/**/results
/e2e/build_results.zip /e2e/build_results.zip
# grafana server
/scripts/grafana-server/server.log
# a11y tests # a11y tests
/pa11y-ci-results.json /pa11y-ci-results.json
/pa11y-ci-report /pa11y-ci-report

1
.prettierignore
Unescape View File

@ -7,6 +7,7 @@ public/vendor/
vendor/ vendor/
/data/ /data/
e2e/tmp e2e/tmp
scripts/grafana-server/tmp
public/build/ public/build/
public/sass/*.generated.scss public/sass/*.generated.scss
devenv/ devenv/

4
contribute/style-guides/e2e-core.md
Unescape View File

@ -16,8 +16,8 @@ BASE_URL=http://172.0.10.2:3333 yarn e2e
The above commands use some utils scripts under [_\<repo-root>/e2e_](../../e2e) that can also be used for more control. The above commands use some utils scripts under [_\<repo-root>/e2e_](../../e2e) that can also be used for more control.
- `./e2e/start-server` This creates a fresh new grafana server working dir, setup's config and starts the server. It will also kill any previously started server that is still running using pid file at _\<repo-root>/e2e/tmp/pid_. - `./scripts/grafana-server/start-server` This creates a fresh new grafana server working dir, setup's config and starts the server. It will also kill any previously started server that is still running using pid file at _\<repo-root>/scripts/grafana-server/tmp/pid_.
- `./e2e/wait-for-grafana` waits for `$HOST` and `$PORT` to be available. Per default localhost and 3001. - `./scripts/grafana-server/wait-for-grafana` waits for `$HOST` and `$PORT` to be available. Per default localhost and 3001.
- `./e2e/run-suite <debug|dev|noarg>` Starts cypress in different modes. - `./e2e/run-suite <debug|dev|noarg>` Starts cypress in different modes.
## Test suites ## Test suites

2
e2e/run-suite
Unescape View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -xeo pipefail set -xeo pipefail
. e2e/variables . scripts/grafana-server/variables
if ((BASH_VERSINFO[0] < 4)); then if ((BASH_VERSINFO[0] < 4)); then
echo "Bash ver >= 4 is needed to run this script" echo "Bash ver >= 4 is needed to run this script"

6
e2e/start-and-run-suite
Unescape View File

@ -1,13 +1,13 @@
#!/bin/bash #!/bin/bash
. e2e/variables . scripts/grafana-server/variables
if [ "$BASE_URL" != "" ]; then if [ "$BASE_URL" != "" ]; then
echo -e "BASE_URL set, skipping starting server" echo -e "BASE_URL set, skipping starting server"
else else
# Start it in the background # Start it in the background
./e2e/start-server 2>&1 > e2e/server.log & ./scripts/grafana-server/start-server 2>&1 > scripts/grafana-server/server.log &
./e2e/wait-for-grafana ./scripts/grafana-server/wait-for-grafana
fi fi
./e2e/run-suite "$@" ./e2e/run-suite "$@"

2
e2e/verify-release
Unescape View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
. e2e/variables . scripts/grafana-server/variables
./e2e/run-suite verify/specs ./e2e/run-suite verify/specs

16
scripts/drone/steps/lib.star
Unescape View File

@ -1,6 +1,6 @@
load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket') load('scripts/drone/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token', 'prerelease_bucket')
grabpl_version = 'v2.8.4' grabpl_version = 'v2.8.5'
build_image = 'grafana/build-container:1.4.9' build_image = 'grafana/build-container:1.4.9'
publish_image = 'grafana/grafana-ci-deploy:1.3.1' publish_image = 'grafana/grafana-ci-deploy:1.3.1'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
@ -329,7 +329,7 @@ def upload_cdn_step(edition, ver_mode):
]) ])
else: else:
deps.extend([ deps.extend([
'end-to-end-tests-server', 'grafana-server',
]) ])
return { return {
@ -531,11 +531,11 @@ def test_a11y_frontend_step(ver_mode, edition, port=3001):
'name': 'test-a11y-frontend' + enterprise2_suffix(edition), 'name': 'test-a11y-frontend' + enterprise2_suffix(edition),
'image': 'grafana/docker-puppeteer:1.0.0', 'image': 'grafana/docker-puppeteer:1.0.0',
'depends_on': [ 'depends_on': [
'end-to-end-tests-server' + enterprise2_suffix(edition), 'grafana-server' + enterprise2_suffix(edition),
], ],
'environment': { 'environment': {
'GRAFANA_MISC_STATS_API_KEY': from_secret('grafana_misc_stats_api_key'), 'GRAFANA_MISC_STATS_API_KEY': from_secret('grafana_misc_stats_api_key'),
'HOST': 'end-to-end-tests-server' + enterprise2_suffix(edition), 'HOST': 'grafana-server' + enterprise2_suffix(edition),
'PORT': port, 'PORT': port,
}, },
'failure': failure, 'failure': failure,
@ -662,10 +662,10 @@ def e2e_tests_server_step(edition, port=3001):
} }
if package_file_pfx: if package_file_pfx:
environment['PACKAGE_FILE'] = 'dist/{}-*linux-amd64.tar.gz'.format(package_file_pfx) environment['PACKAGE_FILE'] = 'dist/{}-*linux-amd64.tar.gz'.format(package_file_pfx)
environment['RUNDIR'] = 'e2e/tmp-{}'.format(package_file_pfx) environment['RUNDIR'] = 'scripts/grafana-server/tmp-{}'.format(package_file_pfx)
return { return {
'name': 'end-to-end-tests-server' + enterprise2_suffix(edition), 'name': 'grafana-server' + enterprise2_suffix(edition),
'image': build_image, 'image': build_image,
'detach': True, 'detach': True,
'depends_on': [ 'depends_on': [
@ -673,7 +673,7 @@ def e2e_tests_server_step(edition, port=3001):
], ],
'environment': environment, 'environment': environment,
'commands': [ 'commands': [
'./e2e/start-server', './scripts/grafana-server/start-server',
], ],
} }
@ -688,7 +688,7 @@ def e2e_tests_step(suite, edition, port=3001, tries=None):
'package', 'package',
], ],
'environment': { 'environment': {
'HOST': 'end-to-end-tests-server' + enterprise2_suffix(edition), 'HOST': 'grafana-server' + enterprise2_suffix(edition),
}, },
'commands': [ 'commands': [
'apt-get install -y netcat', 'apt-get install -y netcat',

4
scripts/generate-a11y-report.sh
Unescape View File

@ -22,8 +22,8 @@ if [ "$BASE_URL" != "" ]; then
echo -e "BASE_URL set, skipping starting server" echo -e "BASE_URL set, skipping starting server"
else else
# Start it in the background # Start it in the background
./e2e/start-server > e2e/server.log & ./scripts/grafana-server/start-server > scripts/grafana-server/server.log &
./e2e/wait-for-grafana ./scripts/grafana-server/wait-for-grafana
fi fi
# Run accessibility command # Run accessibility command

0
e2e/custom.ini → scripts/grafana-server/custom.ini
Unescape View File

4
e2e/kill-server → scripts/grafana-server/kill-server
Unescape View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
. e2e/variables . scripts/grafana-server/variables
if [ -f "$PIDFILE" ]; then if [ -f "$PIDFILE" ]; then
echo -e "Found pidfile, killing running grafana-server" echo -e "Found pidfile, killing running grafana-server"
@ -8,4 +8,4 @@ if [ -f "$PIDFILE" ]; then
rm $PIDFILE rm $PIDFILE
fi fi
rm -rf e2e/tmp rm -rf scripts/grafana-server/tmp

6
e2e/start-server → scripts/grafana-server/start-server
Unescape View File

@ -1,12 +1,12 @@
#!/bin/bash #!/bin/bash
set -eo pipefail set -eo pipefail
. e2e/variables . scripts/grafana-server/variables
PORT=${PORT:-$DEFAULT_PORT} PORT=${PORT:-$DEFAULT_PORT}
PACKAGE_FILE=${PACKAGE_FILE:-$DEFAULT_PACKAGE_FILE} PACKAGE_FILE=${PACKAGE_FILE:-$DEFAULT_PACKAGE_FILE}
./e2e/kill-server ./scripts/grafana-server/kill-server
mkdir $RUNDIR mkdir $RUNDIR
@ -36,7 +36,7 @@ else
mkdir $PROV_DIR/datasources mkdir $PROV_DIR/datasources
mkdir $PROV_DIR/dashboards mkdir $PROV_DIR/dashboards
cp ./e2e/custom.ini $RUNDIR/conf/custom.ini cp ./scripts/grafana-server/custom.ini $RUNDIR/conf/custom.ini
cp ./conf/defaults.ini $RUNDIR/conf/defaults.ini cp ./conf/defaults.ini $RUNDIR/conf/defaults.ini
fi fi

2
e2e/variables → scripts/grafana-server/variables
Unescape View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
DEFAULT_RUNDIR=e2e/tmp DEFAULT_RUNDIR=scripts/grafana-server/tmp
RUNDIR=${RUNDIR:-$DEFAULT_RUNDIR} RUNDIR=${RUNDIR:-$DEFAULT_RUNDIR}
HOME_PATH=$PWD/$RUNDIR HOME_PATH=$PWD/$RUNDIR
PIDFILE=$RUNDIR/pid PIDFILE=$RUNDIR/pid

2
e2e/wait-for-grafana → scripts/grafana-server/wait-for-grafana
Unescape View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -eo pipefail set -eo pipefail
. e2e/variables . scripts/grafana-server/variables
HOST=${HOST:-$DEFAULT_HOST} HOST=${HOST:-$DEFAULT_HOST}
PORT=${PORT:-$DEFAULT_PORT} PORT=${PORT:-$DEFAULT_PORT}
Write Preview
Loading…
Cancel
Save