From 47519234421f808c1061c1bc50dd8cf8cd7a8581 Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Thu, 8 Oct 2020 07:39:00 +0200 Subject: [PATCH] Drone: Fix release pipelines (#28100) Signed-off-by: Arve Knudsen --- .drone.yml | 8 ++++---- scripts/lib.star | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index c3c8bcb2f8a..6a51d0d7fd4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1017,7 +1017,7 @@ 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 + - .\grabpl.exe windows-installer --edition oss $$env:DRONE_TAG - $$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/ @@ -1364,7 +1364,7 @@ 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 + - .\grabpl.exe windows-installer --edition enterprise $$env:DRONE_TAG - $$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/ @@ -1772,7 +1772,7 @@ 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 + - .\grabpl.exe windows-installer --edition oss 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/ @@ -2113,7 +2113,7 @@ 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 + - .\grabpl.exe windows-installer --edition enterprise 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/ diff --git a/scripts/lib.star b/scripts/lib.star index 81144e482b3..c1877815cf4 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -831,10 +831,10 @@ 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 == 'release': - ver_part = '' + ver_part = '$$env:DRONE_TAG' dir = 'release' elif ver_mode == 'test-release': - ver_part = '' + ver_part = test_release_ver dir = 'release' else: dir = 'master' @@ -842,7 +842,7 @@ def get_windows_steps(edition, ver_mode, is_downstream=False): build_no = 'DRONE_BUILD_NUMBER' else: build_no = 'SOURCE_BUILD_NUMBER' - ver_part = ' --build-id $$env:{}'.format(build_no) + ver_part = '--build-id $$env:{}'.format(build_no) installer_commands = [ '$$gcpKey = $$env:GCP_KEY', '[System.Text.Encoding]::UTF8.GetString([System.Convert]::FromBase64String($$gcpKey)) > gcpkey.json', @@ -851,7 +851,7 @@ 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, 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),