opensource/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-07-30 15:02:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Drone: Upgrade build pipeline tool (#27100)

Browse Source 
* Drone: Upgrade build pipeline tool

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

* Run e2e via grabpl
This commit is contained in:
Arve Knudsen
2020-08-20 17:56:20 +02:00
committed by GitHub
parent a8b57a2dd0
commit 756b8fcdf0
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.drone.yml
View File

@ -26,7 +26,7 @@ steps:
- yarn install --frozen-lockfile --no-progress - yarn install --frozen-lockfile --no-progress
environment: environment:
DOCKERIZE_VERSION: 0.6.1 DOCKERIZE_VERSION: 0.6.1
GRABPL_VERSION: 0.5.1 GRABPL_VERSION: 0.5.4
- name: lint-backend - name: lint-backend
image: grafana/build-container:1.2.24 image: grafana/build-container:1.2.24
@ -133,8 +133,7 @@ steps:
image: grafana/ci-e2e:12.18-1 image: grafana/ci-e2e:12.18-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./e2e/wait-for-grafana - ./bin/grabpl e2e-tests
- ./e2e/run-suite
environment: environment:
HOST: end-to-end-tests-server HOST: end-to-end-tests-server
depends_on: depends_on:
@ -253,7 +252,7 @@ steps:
- yarn install --frozen-lockfile --no-progress - yarn install --frozen-lockfile --no-progress
environment: environment:
DOCKERIZE_VERSION: 0.6.1 DOCKERIZE_VERSION: 0.6.1
GRABPL_VERSION: 0.5.1 GRABPL_VERSION: 0.5.4
- name: lint-backend - name: lint-backend
image: grafana/build-container:1.2.24 image: grafana/build-container:1.2.24
@ -360,8 +359,7 @@ steps:
image: grafana/ci-e2e:12.18-1 image: grafana/ci-e2e:12.18-1
commands: commands:
- ./node_modules/.bin/cypress install - ./node_modules/.bin/cypress install
- ./e2e/wait-for-grafana - ./bin/grabpl e2e-tests
- ./e2e/run-suite
environment: environment:
HOST: end-to-end-tests-server HOST: end-to-end-tests-server
depends_on: depends_on:
@ -521,7 +519,7 @@ steps:
- gcloud auth activate-service-account --key-file=gcpkey.json - gcloud auth activate-service-account --key-file=gcpkey.json
- rm gcpkey.json - rm gcpkey.json
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.1/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.4/windows/grabpl.exe -OutFile grabpl.exe
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/oss/master/grafana-7.2.0-9fffe273pre.windows-amd64.zip -OutFile grafana.zip - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/oss/master/grafana-7.2.0-9fffe273pre.windows-amd64.zip -OutFile grafana.zip
- cp C:\App\nssm-2.24.zip . - cp C:\App\nssm-2.24.zip .
- ./grabpl.exe windows-installer --edition oss grafana.zip - ./grabpl.exe windows-installer --edition oss grafana.zip

5
scripts/lib.star
View File

@ -3,7 +3,7 @@ publish_image = 'grafana/grafana-ci-deploy:1.2.5'
grafana_docker_image = 'grafana/drone-grafana-docker:0.2.0' grafana_docker_image = 'grafana/drone-grafana-docker:0.2.0'
alpine_image = 'alpine:3.12' alpine_image = 'alpine:3.12'
windows_image = 'mcr.microsoft.com/windows:1809' windows_image = 'mcr.microsoft.com/windows:1809'
grabpl_version = '0.5.1' grabpl_version = '0.5.4'
def pr_pipelines(edition): def pr_pipelines(edition):
services = [ services = [
@ -459,8 +459,7 @@ def e2e_tests_step():
# Have to re-install Cypress since it insists on searching for its binary beneath /root/.cache, # Have to re-install Cypress since it insists on searching for its binary beneath /root/.cache,
# even though the Yarn cache directory is beneath /usr/local/share somewhere # even though the Yarn cache directory is beneath /usr/local/share somewhere
'./node_modules/.bin/cypress install', './node_modules/.bin/cypress install',
'./e2e/wait-for-grafana', './bin/grabpl e2e-tests',
'./e2e/run-suite',
], ],
} }