[v9.5.x] CI: Update secret refs to vault ones; update downstream repo origin (#72548)

CI: Update secret refs to vault ones; update downstream repo origin (#72515)

Update secret refs to vault ones; update downstream repo origin

(cherry picked from commit 6669d0a704)

Co-authored-by: Kevin Minehart <kmineh0151@gmail.com>
This commit is contained in:
Guilherme Caulada
2023-08-17 15:33:47 +02:00
committed by Horst Gutmann
co-authored by Kevin Minehart
parent cbf6e59b29
commit 3d09fd09ef
3 changed files with 17 additions and 12 deletions
+9 -7
View File
@@ -2049,6 +2049,8 @@ trigger:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana-security-mirror
type: docker
volumes:
- host:
@@ -2777,7 +2779,7 @@ steps:
- compile-build-cmd
environment:
GCP_KEY:
from_secret: gcp_key
from_secret: gcp_upload_artifacts_key
PRERELEASE_BUCKET:
from_secret: prerelease_bucket
image: grafana/grafana-ci-deploy:1.3.3
@@ -2788,7 +2790,7 @@ steps:
- compile-build-cmd
environment:
GCP_KEY:
from_secret: gcp_key
from_secret: gcp_upload_artifacts_key
PRERELEASE_BUCKET:
from_secret: prerelease_bucket
STATIC_ASSET_EDITIONS:
@@ -2801,7 +2803,7 @@ steps:
- compile-build-cmd
environment:
GCP_KEY:
from_secret: gcp_key
from_secret: gcp_upload_artifacts_key
PRERELEASE_BUCKET:
from_secret: prerelease_bucket
image: grafana/grafana-ci-deploy:1.3.3
@@ -2852,7 +2854,7 @@ steps:
- yarn-install
environment:
GCP_KEY:
from_secret: gcp_key
from_secret: gcp_upload_artifacts_key
PRERELEASE_BUCKET:
from_secret: prerelease_bucket
failure: ignore
@@ -2998,7 +3000,7 @@ steps:
BUCKET:
from_secret: prerelease_bucket
GCP_KEY:
from_secret: gcp_key
from_secret: gcp_upload_artifacts_key
failure: ignore
image: google/cloud-sdk:431.0.0
name: gsutil-stat
@@ -3271,7 +3273,7 @@ steps:
environment:
BUCKET: grafana-prerelease-dev
GCP_KEY:
from_secret: gcp_key
from_secret: gcp_upload_artifacts_key
failure: ignore
image: google/cloud-sdk:431.0.0
name: gsutil-stat
@@ -4489,6 +4491,6 @@ kind: secret
name: github_token
---
kind: signature
hmac: a9b87d01af624c9db4807ad33144358f985b0230fde5ec7e34c0037d28360307
hmac: 911c16cdd96d4049c5fd8482d12c635786d91b17b94727d1798343c768a5d25b
...
+5 -5
View File
@@ -106,7 +106,7 @@ def retrieve_npm_packages_step():
],
"failure": "ignore",
"environment": {
"GCP_KEY": from_secret("gcp_key"),
"GCP_KEY": from_secret(gcp_upload_artifacts_key),
"PRERELEASE_BUCKET": from_secret(prerelease_bucket),
},
"commands": ["./bin/build artifacts npm retrieve --tag ${DRONE_TAG}"],
@@ -265,7 +265,7 @@ def publish_artifacts_step():
"name": "publish-artifacts",
"image": images["publish_image"],
"environment": {
"GCP_KEY": from_secret("gcp_key"),
"GCP_KEY": from_secret(gcp_upload_artifacts_key),
"PRERELEASE_BUCKET": from_secret("prerelease_bucket"),
},
"commands": [
@@ -279,7 +279,7 @@ def publish_static_assets_step():
"name": "publish-static-assets",
"image": images["publish_image"],
"environment": {
"GCP_KEY": from_secret("gcp_key"),
"GCP_KEY": from_secret(gcp_upload_artifacts_key),
"PRERELEASE_BUCKET": from_secret("prerelease_bucket"),
"STATIC_ASSET_EDITIONS": from_secret("static_asset_editions"),
},
@@ -294,7 +294,7 @@ def publish_storybook_step():
"name": "publish-storybook",
"image": images["publish_image"],
"environment": {
"GCP_KEY": from_secret("gcp_key"),
"GCP_KEY": from_secret(gcp_upload_artifacts_key),
"PRERELEASE_BUCKET": from_secret("prerelease_bucket"),
},
"commands": [
@@ -430,7 +430,7 @@ def integration_test_pipelines():
def verify_release_pipeline(
name = "verify-prerelease-assets",
bucket = from_secret(prerelease_bucket),
gcp_key = from_secret("gcp_key"),
gcp_key = from_secret(gcp_upload_artifacts_key),
version = "${DRONE_TAG}",
trigger = release_trigger,
depends_on = [
@@ -23,6 +23,9 @@ trigger = {
"latest.json",
],
},
"repo": [
"grafana/grafana-security-mirror",
],
}
def enterprise_downstream_pipeline():