[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-07-28 16:00:26 -03:00
committed by GitHub
co-authored by Kevin Minehart
parent bd5728df22
commit 817613f52e
3 changed files with 16 additions and 11 deletions
+8 -6
View File
@@ -2049,6 +2049,8 @@ trigger:
- '*.md'
- docs/**
- latest.json
repo:
- grafana/grafana-security-mirror
type: docker
volumes:
- host:
@@ -2227,7 +2229,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
@@ -2238,7 +2240,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:
@@ -2251,7 +2253,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
@@ -2302,7 +2304,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
@@ -2807,7 +2809,7 @@ steps:
environment:
BUCKET: grafana-prerelease
GCP_KEY:
from_secret: gcp_key
from_secret: gcp_upload_artifacts_key
failure: ignore
image: google/cloud-sdk:431.0.0
name: gsutil-stat
@@ -4077,6 +4079,6 @@ kind: secret
name: github_token
---
kind: signature
hmac: d5802caee2e7d538c04e5c28ff2d9d6579df59e74436320503041bbeee44ba7c
hmac: 3c78f9469e1e7210a083720809140e3c4c447ccd4dc2306246fc08645b9f4324
...
+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():