From d1c4560d6ed83aafa0b9d8618658a55d66341931 Mon Sep 17 00:00:00 2001
From: Dimitris Sotirakis <dimitrios.sotirakis@grafana.com>
Date: Wed, 25 Jan 2023 15:35:29 +0200
Subject: [PATCH] [v8.5.x] Merge changes from `release-8.5.20` branch (#62103)

Update gpg secret name

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

diff --git a/.drone.yml b/.drone.yml
index fd705b10edc..1e9446795a5 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1336,6 +1336,8 @@ steps:
   depends_on:
   - grabpl
   environment:
+    GCP_KEY:
+      from_secret: gcp_key
     GPG_KEY_PASSWORD:
       from_secret: packages_gpg_passphrase
     GPG_PRIV_KEY:
@@ -3127,6 +3129,8 @@ steps:
   depends_on:
   - grabpl
   environment:
+    GCP_KEY:
+      from_secret: gcp_key
     GPG_KEY_PASSWORD:
       from_secret: packages_gpg_passphrase
     GPG_PRIV_KEY:
@@ -3173,6 +3177,8 @@ steps:
   depends_on:
   - grabpl
   environment:
+    GCP_KEY:
+      from_secret: gcp_key
     GPG_KEY_PASSWORD:
       from_secret: packages_gpg_passphrase
     GPG_PRIV_KEY:
@@ -4632,6 +4638,6 @@ kind: secret
 name: aws_secret_access_key
 ---
 kind: signature
-hmac: ed5c6f87c21245d54bd48e3376063a5839b9041aa123bf3fd4a6708d8a0aec3f
+hmac: 2b78b3489ea0d6afba76f0ccf5b59cb5c77e92d5f5ee7b39bc9ff4010cd32ed6
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 8e2a3ef72b7..f14958c2570 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -995,6 +995,7 @@ def store_packages_step(edition, ver_mode):
         ],
         'environment': {
             'GRAFANA_COM_API_KEY': from_secret('grafana_api_key'),
+            'GCP_KEY': from_secret('gcp_key'),
             'GPG_PRIV_KEY': from_secret('packages_gpg_private_key'),
             'GPG_PUB_KEY': from_secret('packages_gpg_public_key'),
             'GPG_KEY_PASSWORD': from_secret('packages_gpg_passphrase'),