IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-27 09:21:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update grabpl version to 2.3.1 (#37208)

Browse Source
This commit is contained in:
Dimitris Sotirakis 2021-07-27 12:52:01 +03:00 committed by GitHub
parent 56702376b6
commit 0c804df763
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
.drone.yml
View File

@ -17,7 +17,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@ -258,7 +258,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@ -589,7 +589,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/windows/grabpl.exe -OutFile grabpl.exe
- name: build-windows-installer - name: build-windows-installer
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
@ -638,7 +638,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
environment: environment:
@ -723,7 +723,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version ${DRONE_TAG} - ./bin/grabpl verify-version ${DRONE_TAG}
@ -1029,7 +1029,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/windows/grabpl.exe -OutFile grabpl.exe
- name: build-windows-installer - name: build-windows-installer
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
@ -1079,7 +1079,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@ -1504,7 +1504,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/windows/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
- git checkout ${DRONE_TAG} - git checkout ${DRONE_TAG}
@ -1572,7 +1572,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version ${DRONE_TAG} - ./bin/grabpl verify-version ${DRONE_TAG}
@ -1677,7 +1677,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version v7.3.0-test - ./bin/grabpl verify-version v7.3.0-test
@ -1972,7 +1972,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/windows/grabpl.exe -OutFile grabpl.exe
- name: build-windows-installer - name: build-windows-installer
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
@ -2022,7 +2022,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@ -2441,7 +2441,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/windows/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
- git checkout main - git checkout main
@ -2509,7 +2509,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- ./bin/grabpl verify-version v7.3.0-test - ./bin/grabpl verify-version v7.3.0-test
@ -2614,7 +2614,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- ./bin/grabpl verify-drone - ./bin/grabpl verify-drone
- curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz - curl -fLO https://github.com/jwilder/dockerize/releases/download/v$${DOCKERIZE_VERSION}/dockerize-linux-amd64-v$${DOCKERIZE_VERSION}.tar.gz
@ -2884,7 +2884,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/windows/grabpl.exe -OutFile grabpl.exe
- name: build-windows-installer - name: build-windows-installer
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
@ -2930,7 +2930,7 @@ steps:
image: grafana/build-container:1.4.1 image: grafana/build-container:1.4.1
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/grabpl
- chmod +x bin/grabpl - chmod +x bin/grabpl
- git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git"
- cd grafana-enterprise - cd grafana-enterprise
@ -3352,7 +3352,7 @@ steps:
image: grafana/ci-wix:0.1.1 image: grafana/ci-wix:0.1.1
commands: commands:
- $$ProgressPreference = "SilentlyContinue" - $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.2.8/windows/grabpl.exe -OutFile grabpl.exe - Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v2.3.1/windows/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
- git checkout $$env:DRONE_BRANCH - git checkout $$env:DRONE_BRANCH
@ -3494,8 +3494,4 @@ get:
path: infra/data/ci/drone path: infra/data/ci/drone
name: machine-user-token name: machine-user-token
---
kind: signature
hmac: fa16b4de5ce285e6e9495b3ed797383627ffd4d43539eab58186fe8cc227d3e7
... ...

2
scripts/lib.star
View File

@ -1,6 +1,6 @@
load('scripts/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token') load('scripts/vault.star', 'from_secret', 'github_token', 'pull_secret', 'drone_token')
grabpl_version = '2.2.8' grabpl_version = '2.3.1'
build_image = 'grafana/build-container:1.4.1' build_image = 'grafana/build-container:1.4.1'
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'