Drone: Fix release pipelines (#28098)

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

.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 $$env:DRONE_TAG
+  - .\grabpl.exe windows-installer --edition oss
   - $$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 $$env:DRONE_TAG
+  - .\grabpl.exe windows-installer --edition enterprise
   - $$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 v7.3.0-test
+  - .\grabpl.exe windows-installer --edition oss
   - $$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 v7.3.0-test
+  - .\grabpl.exe windows-installer --edition enterprise
   - $$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/

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 = '$$env:DRONE_TAG'
+            ver_part = ''
             dir = 'release'
         elif ver_mode == 'test-release':
-            ver_part = test_release_ver
+            ver_part = ''
             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),