[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

@@ -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
 
 ...

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'),