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 test-release pipeline (#28108)

Browse Source 
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
Arve Knudsen 2020-10-08 13:28:20 +02:00 committed by GitHub
parent 3af193358c
commit 26ac672854
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.drone.yml
View File

@ -1772,10 +1772,10 @@ 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
- cp C:\App\nssm-2.24.zip . - cp C:\App\nssm-2.24.zip .
- .\grabpl.exe windows-installer --edition oss v7.3.0-test - .\grabpl.exe windows-installer --edition oss --packages-bucket grafana-downloads-test v7.3.0-test
- $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0] - $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]
- gsutil cp $$fname gs://grafana-downloads/oss/release/ - gsutil cp $$fname gs://grafana-downloads-test/oss/release/
- gsutil cp "$$fname.sha256" gs://grafana-downloads/oss/release/ - gsutil cp "$$fname.sha256" gs://grafana-downloads-test/oss/release/
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key
@ -2113,10 +2113,10 @@ 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
- cp C:\App\nssm-2.24.zip . - cp C:\App\nssm-2.24.zip .
- .\grabpl.exe windows-installer --edition enterprise v7.3.0-test - .\grabpl.exe windows-installer --edition enterprise --packages-bucket grafana-downloads-test v7.3.0-test
- $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0] - $$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]
- gsutil cp $$fname gs://grafana-downloads/enterprise/release/ - gsutil cp $$fname gs://grafana-downloads-test/enterprise/release/
- gsutil cp "$$fname.sha256" gs://grafana-downloads/enterprise/release/ - gsutil cp "$$fname.sha256" gs://grafana-downloads-test/enterprise/release/
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_key

10
scripts/lib.star
View File

@ -828,12 +828,16 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
}, },
] ]
if (ver_mode == 'master' and (edition != 'enterprise' or is_downstream)) or ver_mode in ('release', 'test-release'): if (ver_mode == 'master' and (edition != 'enterprise' or is_downstream)) or ver_mode in ('release', 'test-release'):
bucket_part = ''
bucket = 'grafana-downloads'
if ver_mode == 'release': if ver_mode == 'release':
ver_part = '$$env:DRONE_TAG' ver_part = '$$env:DRONE_TAG'
dir = 'release' dir = 'release'
elif ver_mode == 'test-release': elif ver_mode == 'test-release':
ver_part = test_release_ver ver_part = test_release_ver
dir = 'release' dir = 'release'
bucket = 'grafana-downloads-test'
bucket_part = ' --packages-bucket grafana-downloads-test'
else: else:
dir = 'master' dir = 'master'
if not is_downstream: if not is_downstream:
@ -849,10 +853,10 @@ def get_windows_steps(edition, ver_mode, is_downstream=False):
'gcloud auth activate-service-account --key-file=gcpkey.json', 'gcloud auth activate-service-account --key-file=gcpkey.json',
'rm gcpkey.json', 'rm gcpkey.json',
'cp C:\\App\\nssm-2.24.zip .', 'cp C:\\App\\nssm-2.24.zip .',
'.\\grabpl.exe windows-installer --edition {} {}'.format(edition, ver_part), '.\\grabpl.exe windows-installer --edition {}{} {}'.format(edition, bucket_part, ver_part),
'$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]', '$$fname = ((Get-Childitem grafana*.msi -name) -split "`n")[0]',
'gsutil cp $$fname gs://grafana-downloads/{}/{}/'.format(edition, dir), 'gsutil cp $$fname gs://{}/{}/{}/'.format(bucket, edition, dir),
'gsutil cp "$$fname.sha256" gs://grafana-downloads/{}/{}/'.format(edition, dir), 'gsutil cp "$$fname.sha256" gs://{}/{}/{}/'.format(bucket, edition, dir),
] ]
steps.append({ steps.append({
'name': 'build-windows-installer', 'name': 'build-windows-installer',