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

Drone: Fix enterprise release pipeline (#28289)

Browse Source 
* Drone: Fixes

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

* Drone: Fixes

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-10-15 14:06:52 +02:00 committed by GitHub
parent e36925b55a
commit d9a156298b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.drone.yml
View File

@ -1072,7 +1072,7 @@ steps:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
- name: clone - name: clone
image: alpine/git:v2.26.2 image: grafana/build-container:1.2.27
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.18/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.18/grabpl
@ -1089,7 +1089,8 @@ steps:
image: grafana/build-container:1.2.27 image: grafana/build-container:1.2.27
commands: commands:
- export DRONE_TAG=$$(./bin/grabpl parse-tag-ref ${DRONE_COMMIT_REF}) - export DRONE_TAG=$$(./bin/grabpl parse-tag-ref ${DRONE_COMMIT_REF})
- mv grabpl /tmp - mv bin/grabpl /tmp/
- rmdir bin
- mv grafana-enterprise /tmp/ - mv grafana-enterprise /tmp/
- /tmp/grabpl init-enterprise /tmp/grafana-enterprise $${DRONE_TAG} - /tmp/grabpl init-enterprise /tmp/grafana-enterprise $${DRONE_TAG}
- mkdir bin - mkdir bin
@ -1835,7 +1836,7 @@ steps:
- echo $DRONE_RUNNER_NAME - echo $DRONE_RUNNER_NAME
- name: clone - name: clone
image: alpine/git:v2.26.2 image: grafana/build-container:1.2.27
commands: commands:
- mkdir -p bin - mkdir -p bin
- curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.18/grabpl - curl -fL -o bin/grabpl https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.18/grabpl
@ -1850,7 +1851,8 @@ steps:
- name: initialize - name: initialize
image: grafana/build-container:1.2.27 image: grafana/build-container:1.2.27
commands: commands:
- mv grabpl /tmp - mv bin/grabpl /tmp/
- rmdir bin
- mv grafana-enterprise /tmp/ - mv grafana-enterprise /tmp/
- /tmp/grabpl init-enterprise /tmp/grafana-enterprise - /tmp/grabpl init-enterprise /tmp/grafana-enterprise
- mkdir bin - mkdir bin

6
scripts/lib.star
View File

@ -4,7 +4,6 @@ publish_image = 'grafana/grafana-ci-deploy:1.2.6'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2' grafana_docker_image = 'grafana/drone-grafana-docker:0.3.2'
alpine_image = 'alpine:3.12' alpine_image = 'alpine:3.12'
windows_image = 'mcr.microsoft.com/windows:1809' windows_image = 'mcr.microsoft.com/windows:1809'
git_image = 'alpine/git:v2.26.2'
dockerize_version = '0.6.1' dockerize_version = '0.6.1'
wix_image = 'grafana/ci-wix:0.1.1' wix_image = 'grafana/ci-wix:0.1.1'
test_release_ver = 'v7.3.0-test' test_release_ver = 'v7.3.0-test'
@ -138,7 +137,7 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
identify_runner_step, identify_runner_step,
{ {
'name': 'clone', 'name': 'clone',
'image': git_image, 'image': build_image,
'environment': { 'environment': {
'GITHUB_TOKEN': { 'GITHUB_TOKEN': {
'from_secret': 'github_token', 'from_secret': 'github_token',
@ -160,7 +159,8 @@ def init_steps(edition, platform, ver_mode, is_downstream=False, install_deps=Tr
'clone', 'clone',
], ],
'commands': pre_cmds + [ 'commands': pre_cmds + [
'mv grabpl /tmp', 'mv bin/grabpl /tmp/',
'rmdir bin',
'mv grafana-enterprise /tmp/', 'mv grafana-enterprise /tmp/',
'/tmp/grabpl init-enterprise /tmp/grafana-enterprise{}'.format(source_commit), '/tmp/grabpl init-enterprise /tmp/grafana-enterprise{}'.format(source_commit),
'mkdir bin', 'mkdir bin',