mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Drone: Fix test-release pipeline (#28108)
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
This commit is contained in:
parent
3af193358c
commit
26ac672854
12
.drone.yml
12
.drone.yml
@ -1772,10 +1772,10 @@ steps:
|
||||
- gcloud auth activate-service-account --key-file=gcpkey.json
|
||||
- rm gcpkey.json
|
||||
- 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]
|
||||
- gsutil cp $$fname gs://grafana-downloads/oss/release/
|
||||
- gsutil cp "$$fname.sha256" gs://grafana-downloads/oss/release/
|
||||
- gsutil cp $$fname gs://grafana-downloads-test/oss/release/
|
||||
- gsutil cp "$$fname.sha256" gs://grafana-downloads-test/oss/release/
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
@ -2113,10 +2113,10 @@ steps:
|
||||
- gcloud auth activate-service-account --key-file=gcpkey.json
|
||||
- rm gcpkey.json
|
||||
- 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]
|
||||
- gsutil cp $$fname gs://grafana-downloads/enterprise/release/
|
||||
- gsutil cp "$$fname.sha256" gs://grafana-downloads/enterprise/release/
|
||||
- gsutil cp $$fname gs://grafana-downloads-test/enterprise/release/
|
||||
- gsutil cp "$$fname.sha256" gs://grafana-downloads-test/enterprise/release/
|
||||
environment:
|
||||
GCP_KEY:
|
||||
from_secret: gcp_key
|
||||
|
@ -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'):
|
||||
bucket_part = ''
|
||||
bucket = 'grafana-downloads'
|
||||
if ver_mode == 'release':
|
||||
ver_part = '$$env:DRONE_TAG'
|
||||
dir = 'release'
|
||||
elif ver_mode == 'test-release':
|
||||
ver_part = test_release_ver
|
||||
dir = 'release'
|
||||
bucket = 'grafana-downloads-test'
|
||||
bucket_part = ' --packages-bucket grafana-downloads-test'
|
||||
else:
|
||||
dir = 'master'
|
||||
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',
|
||||
'rm gcpkey.json',
|
||||
'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]',
|
||||
'gsutil cp $$fname gs://grafana-downloads/{}/{}/'.format(edition, dir),
|
||||
'gsutil cp "$$fname.sha256" gs://grafana-downloads/{}/{}/'.format(edition, dir),
|
||||
'gsutil cp $$fname gs://{}/{}/{}/'.format(bucket, edition, dir),
|
||||
'gsutil cp "$$fname.sha256" gs://{}/{}/{}/'.format(bucket, edition, dir),
|
||||
]
|
||||
steps.append({
|
||||
'name': 'build-windows-installer',
|
||||
|
Loading…
Reference in New Issue
Block a user