From 623cd8f41cc6f7d7a34102c85e42460b9af2a06c Mon Sep 17 00:00:00 2001
From: Kevin Minehart <kmineh0151@gmail.com>
Date: Tue, 24 Jan 2023 11:16:21 -0600
Subject: [PATCH] update gpg secret name (#731)

---
 .drone.yml                   | 26 ++++++++++----------------
 scripts/drone/steps/lib.star |  7 +++----
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index dcbd36eaf15..fd705b10edc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1336,14 +1336,12 @@ steps:
   depends_on:
   - grabpl
   environment:
-    GCP_KEY:
-      from_secret: gcp_key
     GPG_KEY_PASSWORD:
-      from_secret: gpg_key_password
+      from_secret: packages_gpg_passphrase
     GPG_PRIV_KEY:
-      from_secret: gpg_priv_key
+      from_secret: packages_gpg_private_key
     GPG_PUB_KEY:
-      from_secret: gpg_pub_key
+      from_secret: packages_gpg_public_key
     GRAFANA_COM_API_KEY:
       from_secret: grafana_api_key
   image: grafana/grafana-ci-deploy:1.3.1
@@ -3129,14 +3127,12 @@ steps:
   depends_on:
   - grabpl
   environment:
-    GCP_KEY:
-      from_secret: gcp_key
     GPG_KEY_PASSWORD:
-      from_secret: gpg_key_password
+      from_secret: packages_gpg_passphrase
     GPG_PRIV_KEY:
-      from_secret: gpg_priv_key
+      from_secret: packages_gpg_private_key
     GPG_PUB_KEY:
-      from_secret: gpg_pub_key
+      from_secret: packages_gpg_public_key
     GRAFANA_COM_API_KEY:
       from_secret: grafana_api_key
   image: grafana/grafana-ci-deploy:1.3.1
@@ -3177,14 +3173,12 @@ steps:
   depends_on:
   - grabpl
   environment:
-    GCP_KEY:
-      from_secret: gcp_key
     GPG_KEY_PASSWORD:
-      from_secret: gpg_key_password
+      from_secret: packages_gpg_passphrase
     GPG_PRIV_KEY:
-      from_secret: gpg_priv_key
+      from_secret: packages_gpg_private_key
     GPG_PUB_KEY:
-      from_secret: gpg_pub_key
+      from_secret: packages_gpg_public_key
     GRAFANA_COM_API_KEY:
       from_secret: grafana_api_key
   image: grafana/grafana-ci-deploy:1.3.1
@@ -4638,6 +4632,6 @@ kind: secret
 name: aws_secret_access_key
 ---
 kind: signature
-hmac: b65ffdb9332c4fa65a76b25e84b5b5e71719d51e76d1cc84a9b230464b1b311c
+hmac: ed5c6f87c21245d54bd48e3376063a5839b9041aa123bf3fd4a6708d8a0aec3f
 
 ...
diff --git a/scripts/drone/steps/lib.star b/scripts/drone/steps/lib.star
index 81bf2782749..8e2a3ef72b7 100644
--- a/scripts/drone/steps/lib.star
+++ b/scripts/drone/steps/lib.star
@@ -995,10 +995,9 @@ 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('gpg_priv_key'),
-            'GPG_PUB_KEY': from_secret('gpg_pub_key'),
-            'GPG_KEY_PASSWORD': from_secret('gpg_key_password'),
+            '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'),
         },
         'commands': [
             cmd,