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 publishing of master artifacts (#27902)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-09-29 18:15:25 +02:00 committed by GitHub
parent 03f059b7c5
commit 26f86ba823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/config.yml
View File

@ -47,7 +47,7 @@ commands:
- run:
name: "Install Grafana build pipeline tool"
command: |
VERSION=0.5.12
VERSION=0.5.13
curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v${VERSION}/grabpl
chmod +x grabpl
mv grabpl /tmp

16
.drone.yml
View File

@ -16,7 +16,7 @@ steps:
- name: initialize
image: grafana/build-container:1.2.27
commands:
- curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.12/grabpl
- curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl
- chmod +x grabpl
- mkdir -p bin
- mv grabpl bin
@ -155,7 +155,7 @@ steps:
- name: copy-packages-for-docker
image: grafana/build-container:1.2.27
commands:
- cp dist/*.tar.gz packaging/docker/
- cp dist/*.tar.gz* packaging/docker/
depends_on:
- package
@ -241,7 +241,7 @@ steps:
image: grafana/ci-wix:0.1.1
commands:
- $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.12/windows/grabpl.exe -OutFile grabpl.exe
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/windows/grabpl.exe -OutFile grabpl.exe
trigger:
event:
@ -265,7 +265,7 @@ steps:
- name: initialize
image: grafana/build-container:1.2.27
commands:
- curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.12/grabpl
- curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl
- chmod +x grabpl
- mkdir -p bin
- mv grabpl bin
@ -450,7 +450,7 @@ steps:
- name: copy-packages-for-docker
image: grafana/build-container:1.2.27
commands:
- cp dist/*.tar.gz packaging/docker/
- cp dist/*.tar.gz* packaging/docker/
depends_on:
- package
@ -586,7 +586,7 @@ steps:
image: grafana/ci-wix:0.1.1
commands:
- $$ProgressPreference = "SilentlyContinue"
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.12/windows/grabpl.exe -OutFile grabpl.exe
- Invoke-WebRequest https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/windows/grabpl.exe -OutFile grabpl.exe
- name: build-windows-installer
image: grafana/ci-wix:0.1.1
@ -634,7 +634,7 @@ steps:
- name: initialize
image: grafana/build-container:1.2.27
commands:
- curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.12/grabpl
- curl -fLO https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl
- chmod +x grabpl
- mkdir -p bin
- mv grabpl bin
@ -644,7 +644,7 @@ steps:
- name: publish-packages
image: grafana/grafana-ci-deploy:1.2.6
commands:
- ./bin/grabpl publish-packages --edition oss
- ./bin/grabpl publish-packages --edition oss --build-id ${DRONE_BUILD_NUMBER}
environment:
GRAFANA_COM_API_KEY:
from_secret: grafana_api_key

2
packages/grafana-toolkit/docker/grafana-plugin-ci-alpine/scripts/deploy.sh
View File

@ -43,7 +43,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l
"b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32"
chmod +x /usr/local/bin/cc-test-reporter
curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.12/grabpl"
curl -fL -o /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl"
apk add --no-cache git
# Install Mage

2
packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh
View File

@ -44,7 +44,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l
"b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32"
chmod 755 /usr/local/bin/cc-test-reporter
wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.12/grabpl"
wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl"
chmod +x /usr/local/bin/grabpl
# Install Mage

2
packages/grafana-toolkit/docker/grafana-plugin-ci/scripts/deploy.sh
View File

@ -27,7 +27,7 @@ get_file "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-l
"b4138199aa755ebfe171b57cc46910b13258ace5fbc4eaa099c42607cd0bff32"
chmod +x /usr/local/bin/cc-test-reporter
wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.12/grabpl"
wget -O /usr/local/bin/grabpl "https://grafana-downloads.storage.googleapis.com/grafana-build-pipeline/v0.5.13/grabpl"
chmod +x /usr/local/bin/grabpl
# Install Mage

11
scripts/lib.star
View File

@ -3,7 +3,7 @@ publish_image = 'grafana/grafana-ci-deploy:1.2.6'
grafana_docker_image = 'grafana/drone-grafana-docker:0.3.1'
alpine_image = 'alpine:3.12'
windows_image = 'mcr.microsoft.com/windows:1809'
grabpl_version = '0.5.12'
grabpl_version = '0.5.13'
git_image = 'alpine/git:v2.26.2'
dockerize_version = '0.6.1'
wix_image = 'grafana/ci-wix:0.1.1'
@ -626,7 +626,7 @@ def copy_packages_for_docker_step():
'package',
],
'commands': [
'cp dist/*.tar.gz packaging/docker/',
'cp dist/*.tar.gz* packaging/docker/',
],
}
@ -787,6 +787,11 @@ def publish_packages_step(edition, is_downstream):
if edition == 'enterprise' and not is_downstream:
return None
if not is_downstream:
build_no = '${DRONE_BUILD_NUMBER}'
else:
build_no = '$${SOURCE_BUILD_NUMBER}'
return {
'name': 'publish-packages',
'image': publish_image,
@ -799,7 +804,7 @@ def publish_packages_step(edition, is_downstream):
},
},
'commands': [
'./bin/grabpl publish-packages --edition {}'.format(edition),
'./bin/grabpl publish-packages --edition {} --build-id {}'.format(edition, build_no),
],
}