From 71b69f9a5e022097ef9e7c26d5f5e9c231df44d4 Mon Sep 17 00:00:00 2001 From: Dimitris Sotirakis Date: Wed, 23 Aug 2023 11:29:56 +0300 Subject: [PATCH] [v10.0.x] CI: Update secrets for publishing steps (#73661) CI: Update secrets for publishing steps (#73658) Update secrets (cherry picked from commit de118a37362c3492218797d45a7e7f1085043d7f) --- .drone.yml | 10 +++++----- scripts/drone/events/release.star | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index fded29ca3d3..c3a0b4a3386 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2280,7 +2280,7 @@ steps: - compile-build-cmd environment: GCP_KEY: - from_secret: gcp_upload_artifacts_key + from_secret: gcp_grafanauploads_base64 PRERELEASE_BUCKET: from_secret: prerelease_bucket image: grafana/grafana-ci-deploy:1.3.3 @@ -2291,7 +2291,7 @@ steps: - compile-build-cmd environment: GCP_KEY: - from_secret: gcp_upload_artifacts_key + from_secret: gcp_grafanauploads_base64 PRERELEASE_BUCKET: from_secret: prerelease_bucket STATIC_ASSET_EDITIONS: @@ -2304,7 +2304,7 @@ steps: - compile-build-cmd environment: GCP_KEY: - from_secret: gcp_upload_artifacts_key + from_secret: gcp_grafanauploads_base64 PRERELEASE_BUCKET: from_secret: prerelease_bucket image: grafana/grafana-ci-deploy:1.3.3 @@ -2355,7 +2355,7 @@ steps: - yarn-install environment: GCP_KEY: - from_secret: gcp_upload_artifacts_key + from_secret: gcp_grafanauploads_base64 PRERELEASE_BUCKET: from_secret: prerelease_bucket failure: ignore @@ -4187,6 +4187,6 @@ kind: secret name: delivery-bot-app-private-key --- kind: signature -hmac: cfd4179de22a070bc047261b534a5b070ab65e883281208bbdc56f95c0c293d9 +hmac: 386ef565fa4edbebf495577f14aa00c751c9fca95c05c0d62480509e01e64bd3 ... diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star index 0740377826d..16818b1566e 100644 --- a/scripts/drone/events/release.star +++ b/scripts/drone/events/release.star @@ -54,7 +54,7 @@ load( load( "scripts/drone/vault.star", "from_secret", - "gcp_upload_artifacts_key", + "gcp_grafanauploads_base64", "npm_token", "prerelease_bucket", "rgm_gcp_key_base64", @@ -94,7 +94,7 @@ def store_npm_packages_step(): "build-frontend-packages", ], "environment": { - "GCP_KEY": from_secret(gcp_upload_artifacts_key), + "GCP_KEY": from_secret(gcp_grafanauploads_base64), "PRERELEASE_BUCKET": from_secret(prerelease_bucket), }, "commands": ["./bin/build artifacts npm store --tag ${DRONE_TAG}"], @@ -110,7 +110,7 @@ def retrieve_npm_packages_step(): ], "failure": "ignore", "environment": { - "GCP_KEY": from_secret(gcp_upload_artifacts_key), + "GCP_KEY": from_secret(gcp_grafanauploads_base64), "PRERELEASE_BUCKET": from_secret(prerelease_bucket), }, "commands": ["./bin/build artifacts npm retrieve --tag ${DRONE_TAG}"], @@ -271,7 +271,7 @@ def publish_artifacts_step(): "name": "publish-artifacts", "image": images["publish_image"], "environment": { - "GCP_KEY": from_secret(gcp_upload_artifacts_key), + "GCP_KEY": from_secret(gcp_grafanauploads_base64), "PRERELEASE_BUCKET": from_secret("prerelease_bucket"), }, "commands": [ @@ -285,7 +285,7 @@ def publish_static_assets_step(): "name": "publish-static-assets", "image": images["publish_image"], "environment": { - "GCP_KEY": from_secret(gcp_upload_artifacts_key), + "GCP_KEY": from_secret(gcp_grafanauploads_base64), "PRERELEASE_BUCKET": from_secret("prerelease_bucket"), "STATIC_ASSET_EDITIONS": from_secret("static_asset_editions"), }, @@ -300,7 +300,7 @@ def publish_storybook_step(): "name": "publish-storybook", "image": images["publish_image"], "environment": { - "GCP_KEY": from_secret(gcp_upload_artifacts_key), + "GCP_KEY": from_secret(gcp_grafanauploads_base64), "PRERELEASE_BUCKET": from_secret("prerelease_bucket"), }, "commands": [