From 210e06b67a332836063b3208076b8457c51a3fc7 Mon Sep 17 00:00:00 2001
From: Horst Gutmann <horst.gutmann@grafana.com>
Date: Wed, 22 Mar 2023 11:09:55 +0100
Subject: [PATCH] [v8.5.x] Fix environment for linux-package building

---
 .drone.yml                   | 6 +++++-
 scripts/drone/steps/lib.star | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 5c26d49eba7..7c9a218f1f3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3224,6 +3224,8 @@ steps:
   - publish-linux-packages-deb
   - publish-linux-packages-rpm
   environment:
+    GCP_KEY:
+      from_secret: gcp_key
     GRAFANA_COM_API_KEY:
       from_secret: grafana_api_key
   image: grafana/grafana-ci-deploy:1.3.1
@@ -3317,6 +3319,8 @@ steps:
   - publish-linux-packages-deb
   - publish-linux-packages-rpm
   environment:
+    GCP_KEY:
+      from_secret: gcp_key
     GRAFANA_COM_API_KEY:
       from_secret: grafana_api_key
   image: grafana/grafana-ci-deploy:1.3.1
@@ -4778,6 +4782,6 @@ kind: secret
 name: aws_secret_access_key
 ---
 kind: signature
-hmac: 678b5f76c4639141962a9abf82dc915a34b6e11ab4754e70c764a8f0de65a5a5
+hmac: 4f0fed96861f4036f38718ed71bc2fa9147837429073c380a7e7dbdaef75cefd
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index d71b58eff6f..5be3aa87824 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -1028,6 +1028,7 @@ def publish_grafanacom_step(edition, ver_mode):
         ],
         'environment': {
             'GRAFANA_COM_API_KEY': from_secret('grafana_api_key'),
+            'GCP_KEY': from_secret('gcp_key'),
         },
         'commands': [
             cmd,