also when uploading frontend assets

This commit is contained in:
Kevin Minehart
2023-07-20 09:11:48 -05:00
parent 5432e007e3
commit d2eada78d8
2 changed files with 6 additions and 5 deletions
+4 -4
View File
@@ -2083,7 +2083,7 @@ steps:
- grafana-server - grafana-server
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_upload_artifacts_key
PRERELEASE_BUCKET: PRERELEASE_BUCKET:
from_secret: prerelease_bucket from_secret: prerelease_bucket
image: grafana/grafana-ci-deploy:1.3.3 image: grafana/grafana-ci-deploy:1.3.3
@@ -2744,7 +2744,7 @@ steps:
- grafana-server - grafana-server
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_upload_artifacts_key
PRERELEASE_BUCKET: PRERELEASE_BUCKET:
from_secret: prerelease_bucket from_secret: prerelease_bucket
image: grafana/grafana-ci-deploy:1.3.3 image: grafana/grafana-ci-deploy:1.3.3
@@ -3966,7 +3966,7 @@ steps:
- grafana-server - grafana-server
environment: environment:
GCP_KEY: GCP_KEY:
from_secret: gcp_key from_secret: gcp_upload_artifacts_key
PRERELEASE_BUCKET: PRERELEASE_BUCKET:
from_secret: prerelease_bucket from_secret: prerelease_bucket
image: grafana/grafana-ci-deploy:1.3.3 image: grafana/grafana-ci-deploy:1.3.3
@@ -5019,6 +5019,6 @@ kind: secret
name: delivery-bot-app-private-key name: delivery-bot-app-private-key
--- ---
kind: signature kind: signature
hmac: dcee2beb794d3fc77f00566756f0519c4bb7acc5c231e5f81b32616670f9ae8b hmac: 167670c0d4d875110f2d6268cc301b131e5e530fedf79fe80157ebd90e13813d
... ...
+2 -1
View File
@@ -5,6 +5,7 @@ This module is a library of Drone steps and other pipeline components.
load( load(
"scripts/drone/vault.star", "scripts/drone/vault.star",
"from_secret", "from_secret",
"gcp_upload_artifacts_key",
"prerelease_bucket", "prerelease_bucket",
) )
load( load(
@@ -407,7 +408,7 @@ def upload_cdn_step(ver_mode, trigger = None):
"grafana-server", "grafana-server",
], ],
"environment": { "environment": {
"GCP_KEY": from_secret("gcp_key"), "GCP_KEY": from_secret(gcp_upload_artifacts_key),
"PRERELEASE_BUCKET": from_secret(prerelease_bucket), "PRERELEASE_BUCKET": from_secret(prerelease_bucket),
}, },
"commands": [ "commands": [