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

* 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>
2025-02-25 18:55:37 -06:00 · 2022-01-20 19:01:00 +02:00 · 2022-01-20 19:01:00 +02:00 · 22eb2df602
commit 22eb2df602
parent 9ccc7ec76e
15 changed files with 108 additions and 102 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -11,7 +11,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -111,7 +111,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -187,21 +187,21 @@ steps:
  image: grafana/build-container:1.4.9
  name: package
 - commands:
-  - ./e2e/start-server
+  - ./scripts/grafana-server/start-server
  depends_on:
  - package
  detach: true
  environment:
    PORT: 3001
  image: grafana/build-container:1.4.9
-  name: end-to-end-tests-server
+  name: grafana-server
 - commands:
  - apt-get install -y netcat
  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-dashboards-suite
 - commands:
@ -210,7 +210,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-smoke-tests-suite
 - commands:
@ -219,7 +219,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-panels-suite
 - commands:
@ -228,7 +228,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-various-suite
 - commands:
@ -276,11 +276,11 @@ steps:
  - yarn wait-on http://$HOST:$PORT
  - pa11y-ci --config .pa11yci-pr.conf.js
  depends_on:
-  - end-to-end-tests-server
+  - grafana-server
  environment:
    GRAFANA_MISC_STATS_API_KEY:
      from_secret: grafana_misc_stats_api_key
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
    PORT: 3001
  failure: always
  image: grafana/docker-puppeteer:1.0.0
@ -356,7 +356,7 @@ services:
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -417,7 +417,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -518,7 +518,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -617,21 +617,21 @@ steps:
  image: grafana/build-container:1.4.9
  name: package
 - commands:
-  - ./e2e/start-server
+  - ./scripts/grafana-server/start-server
  depends_on:
  - package
  detach: true
  environment:
    PORT: 3001
  image: grafana/build-container:1.4.9
-  name: end-to-end-tests-server
+  name: grafana-server
 - commands:
  - apt-get install -y netcat
  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-dashboards-suite
 - commands:
@ -640,7 +640,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-smoke-tests-suite
 - commands:
@ -649,7 +649,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-panels-suite
 - commands:
@ -658,7 +658,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-various-suite
 - commands:
@ -723,11 +723,11 @@ steps:
  - yarn wait-on http://$HOST:$PORT
  - pa11y-ci --config .pa11yci.conf.js --json > pa11y-ci-results.json
  depends_on:
-  - end-to-end-tests-server
+  - grafana-server
  environment:
    GRAFANA_MISC_STATS_API_KEY:
      from_secret: grafana_misc_stats_api_key
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
    PORT: 3001
  failure: ignore
  image: grafana/docker-puppeteer:1.0.0
@ -808,7 +808,7 @@ steps:
 - commands:
  - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets"
  depends_on:
-  - end-to-end-tests-server
+  - grafana-server
  environment:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
@ -864,7 +864,7 @@ services:
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -932,7 +932,7 @@ steps:
  name: identify-runner
 - commands:
  - $$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
  image: grafana/ci-wix:0.1.1
  name: initialize
@ -1015,7 +1015,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -1098,7 +1098,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -1224,21 +1224,21 @@ steps:
  - name: docker
    path: /var/run/docker.sock
 - commands:
-  - ./e2e/start-server
+  - ./scripts/grafana-server/start-server
  depends_on:
  - package
  detach: true
  environment:
    PORT: 3001
  image: grafana/build-container:1.4.9
-  name: end-to-end-tests-server
+  name: grafana-server
 - commands:
  - apt-get install -y netcat
  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-dashboards-suite
 - commands:
@ -1247,7 +1247,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-smoke-tests-suite
 - commands:
@ -1256,7 +1256,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-panels-suite
 - commands:
@ -1265,7 +1265,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-various-suite
 - commands:
@ -1312,7 +1312,7 @@ steps:
 - commands:
  - ./bin/grabpl upload-cdn --edition oss --bucket "$${PRERELEASE_BUCKET}/artifacts/static-assets"
  depends_on:
-  - end-to-end-tests-server
+  - grafana-server
  environment:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
@ -1402,7 +1402,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -1523,7 +1523,7 @@ services:
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -1607,7 +1607,7 @@ steps:
  name: identify-runner
 - commands:
  - $$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
  image: grafana/ci-wix:0.1.1
  name: initialize
@ -1666,7 +1666,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -1826,23 +1826,23 @@ steps:
  - name: docker
    path: /var/run/docker.sock
 - commands:
-  - ./e2e/start-server
+  - ./scripts/grafana-server/start-server
  depends_on:
  - package
  detach: true
  environment:
    PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz
    PORT: 3001
-    RUNDIR: e2e/tmp-grafana-enterprise
+    RUNDIR: scripts/grafana-server/tmp-grafana-enterprise
  image: grafana/build-container:1.4.9
-  name: end-to-end-tests-server
+  name: grafana-server
 - commands:
  - apt-get install -y netcat
  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-dashboards-suite
 - commands:
@ -1851,7 +1851,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-smoke-tests-suite
 - commands:
@ -1860,7 +1860,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-panels-suite
 - commands:
@ -1869,7 +1869,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-various-suite
 - commands:
@ -2006,7 +2006,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2179,7 +2179,7 @@ services:
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2307,7 +2307,7 @@ steps:
  name: identify-runner
 - commands:
  - $$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
  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
@ -2382,7 +2382,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2460,7 +2460,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2521,7 +2521,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2599,7 +2599,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2661,7 +2661,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2697,7 +2697,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2744,7 +2744,7 @@ steps:
  name: initialize
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2792,7 +2792,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2857,7 +2857,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -2980,21 +2980,21 @@ steps:
  - name: docker
    path: /var/run/docker.sock
 - commands:
-  - ./e2e/start-server
+  - ./scripts/grafana-server/start-server
  depends_on:
  - package
  detach: true
  environment:
    PORT: 3001
  image: grafana/build-container:1.4.9
-  name: end-to-end-tests-server
+  name: grafana-server
 - commands:
  - apt-get install -y netcat
  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-dashboards-suite
 - commands:
@ -3003,7 +3003,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-smoke-tests-suite
 - commands:
@ -3012,7 +3012,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-panels-suite
 - commands:
@ -3021,7 +3021,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-various-suite
 - commands:
@ -3068,7 +3068,7 @@ steps:
 - commands:
  - ./bin/grabpl upload-cdn --edition oss --bucket "grafana-static-assets"
  depends_on:
-  - end-to-end-tests-server
+  - grafana-server
  environment:
    GCP_GRAFANA_UPLOAD_KEY:
      from_secret: gcp_key
@ -3117,7 +3117,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -3231,7 +3231,7 @@ services:
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -3308,7 +3308,7 @@ steps:
  name: identify-runner
 - commands:
  - $$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
  image: grafana/ci-wix:0.1.1
  name: initialize
@ -3356,7 +3356,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -3510,23 +3510,23 @@ steps:
  - name: docker
    path: /var/run/docker.sock
 - commands:
-  - ./e2e/start-server
+  - ./scripts/grafana-server/start-server
  depends_on:
  - package
  detach: true
  environment:
    PACKAGE_FILE: dist/grafana-enterprise-*linux-amd64.tar.gz
    PORT: 3001
-    RUNDIR: e2e/tmp-grafana-enterprise
+    RUNDIR: scripts/grafana-server/tmp-grafana-enterprise
  image: grafana/build-container:1.4.9
-  name: end-to-end-tests-server
+  name: grafana-server
 - commands:
  - apt-get install -y netcat
  - ./bin/grabpl e2e-tests --port 3001 --suite dashboards-suite --tries 3
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-dashboards-suite
 - commands:
@ -3535,7 +3535,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-smoke-tests-suite
 - commands:
@ -3544,7 +3544,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-panels-suite
 - commands:
@ -3553,7 +3553,7 @@ steps:
  depends_on:
  - package
  environment:
-    HOST: end-to-end-tests-server
+    HOST: grafana-server
  image: cypress/included:9.2.0
  name: end-to-end-tests-various-suite
 - commands:
@ -3693,7 +3693,7 @@ services: []
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -3858,7 +3858,7 @@ services:
 steps:
 - commands:
  - 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
  image: byrnedo/alpine-curl:0.1.8
  name: grabpl
@ -3978,7 +3978,7 @@ steps:
  name: identify-runner
 - commands:
  - $$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
  - git clone "https://$$env:GITHUB_TOKEN@github.com/grafana/grafana-enterprise.git"
  - cd grafana-enterprise
@ -4175,6 +4175,6 @@ kind: secret
 name: gcp_upload_artifacts_key
 ---
 kind: signature
-hmac: 00de7a9339c4f19716c6edb0ad6578aaff95e5850cc7c1035d1cdf71c80af283
+hmac: 1ee4baacef44b7189c4a2367166c8f2566baf142e027bf39d62b0886f3846855

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

--- a/.gitignore
+++ b/.gitignore
@ -13,6 +13,7 @@ public/dist/tsconfig.tsbuildinfo
 /emails/dist
 /reports
 /e2e/tmp
+/scripts/grafana-server/tmp
 vendor/
 /docs/menu.yaml
 /requests
@ -140,6 +141,9 @@ compilation-stats.json
 /e2e/benchmarks/**/results
 /e2e/build_results.zip

+# grafana server
+/scripts/grafana-server/server.log
+
 # a11y tests
 /pa11y-ci-results.json
 /pa11y-ci-report
--- a/.prettierignore
+++ b/.prettierignore
@ -7,6 +7,7 @@ public/vendor/
 vendor/
 /data/
 e2e/tmp
+scripts/grafana-server/tmp
 public/build/
 public/sass/*.generated.scss
 devenv/
--- a/contribute/style-guides/e2e-core.md
+++ b/contribute/style-guides/e2e-core.md
@ -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.

- `./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_.
- `./e2e/wait-for-grafana` waits for `$HOST` and `$PORT` to be available. Per default localhost and 3001.
+- `./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_.
+- `./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.

 ## Test suites
--- a/e2e/run-suite
+++ b/e2e/run-suite
@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -xeo pipefail

-. e2e/variables
+. scripts/grafana-server/variables

 if ((BASH_VERSINFO[0] < 4)); then
  echo "Bash ver >= 4 is needed to run this script"
--- a/e2e/start-and-run-suite
+++ b/e2e/start-and-run-suite
@ -1,13 +1,13 @@
 #!/bin/bash

-. e2e/variables
+. scripts/grafana-server/variables

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

 ./e2e/run-suite "$@"
--- a/e2e/verify-release
+++ b/e2e/verify-release
@ -1,5 +1,5 @@
 #!/bin/bash

-. e2e/variables
+. scripts/grafana-server/variables

 ./e2e/run-suite verify/specs
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@ -1,6 +1,6 @@
 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'
 publish_image = 'grafana/grafana-ci-deploy:1.3.1'
 grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
@ -329,7 +329,7 @@ def upload_cdn_step(edition, ver_mode):
        ])
    else:
        deps.extend([
-            'end-to-end-tests-server',
+            'grafana-server',
        ])

    return {
@ -531,11 +531,11 @@ def test_a11y_frontend_step(ver_mode, edition, port=3001):
        'name': 'test-a11y-frontend' + enterprise2_suffix(edition),
        'image': 'grafana/docker-puppeteer:1.0.0',
        'depends_on': [
-            'end-to-end-tests-server' + enterprise2_suffix(edition),
+            'grafana-server' + enterprise2_suffix(edition),
        ],
        'environment': {
            '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,
        },
        'failure': failure,
@ -662,10 +662,10 @@ def e2e_tests_server_step(edition, port=3001):
    }
    if 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 {
-        'name': 'end-to-end-tests-server' + enterprise2_suffix(edition),
+        'name': 'grafana-server' + enterprise2_suffix(edition),
        'image': build_image,
        'detach': True,
        'depends_on': [
@ -673,7 +673,7 @@ def e2e_tests_server_step(edition, port=3001):
        ],
        'environment': environment,
        'commands': [
-            './e2e/start-server',
+            './scripts/grafana-server/start-server',
        ],
    }

@ -688,7 +688,7 @@ def e2e_tests_step(suite, edition, port=3001, tries=None):
            'package',
        ],
        'environment': {
-            'HOST': 'end-to-end-tests-server' + enterprise2_suffix(edition),
+            'HOST': 'grafana-server' + enterprise2_suffix(edition),
        },
        'commands': [
            'apt-get install -y netcat',
--- a/scripts/generate-a11y-report.sh
+++ b/scripts/generate-a11y-report.sh
@ -22,8 +22,8 @@ if [ "$BASE_URL" != "" ]; then
    echo -e "BASE_URL set, skipping starting server"
 else
  # Start it in the background
-  ./e2e/start-server > e2e/server.log &
-  ./e2e/wait-for-grafana
+  ./scripts/grafana-server/start-server > scripts/grafana-server/server.log &
+  ./scripts/grafana-server/wait-for-grafana
 fi

 # Run accessibility command
--- a/scripts/grafana-server/custom.ini
+++ b/scripts/grafana-server/custom.ini
--- a/scripts/grafana-server/kill-server
+++ b/scripts/grafana-server/kill-server
@ -1,6 +1,6 @@
 #!/bin/bash

-. e2e/variables
+. scripts/grafana-server/variables

 if [ -f "$PIDFILE" ]; then
  echo -e "Found pidfile, killing running grafana-server"
@ -8,4 +8,4 @@ if [ -f "$PIDFILE" ]; then
  rm $PIDFILE
 fi

-rm -rf e2e/tmp
+rm -rf scripts/grafana-server/tmp
--- a/scripts/grafana-server/start-server
+++ b/scripts/grafana-server/start-server
@ -1,12 +1,12 @@
 #!/bin/bash
 set -eo pipefail

-. e2e/variables
+. scripts/grafana-server/variables

 PORT=${PORT:-$DEFAULT_PORT}
 PACKAGE_FILE=${PACKAGE_FILE:-$DEFAULT_PACKAGE_FILE}

-./e2e/kill-server
+./scripts/grafana-server/kill-server

 mkdir $RUNDIR

@ -36,7 +36,7 @@ else
  mkdir $PROV_DIR/datasources
  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
 fi

--- a/scripts/grafana-server/variables
+++ b/scripts/grafana-server/variables
@ -1,6 +1,6 @@
 #!/bin/bash

-DEFAULT_RUNDIR=e2e/tmp
+DEFAULT_RUNDIR=scripts/grafana-server/tmp
 RUNDIR=${RUNDIR:-$DEFAULT_RUNDIR}
 HOME_PATH=$PWD/$RUNDIR
 PIDFILE=$RUNDIR/pid
--- a/scripts/grafana-server/wait-for-grafana
+++ b/scripts/grafana-server/wait-for-grafana
@ -1,7 +1,7 @@
 #!/bin/bash
 set -eo pipefail

-. e2e/variables
+. scripts/grafana-server/variables

 HOST=${HOST:-$DEFAULT_HOST}
 PORT=${PORT:-$DEFAULT_PORT}