[v10.1.x] CI: Update secret refs to vault ones; update downstream repo origin (#72550)
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:
co-authored by
Kevin Minehart
parent
7de8bd95df
commit
47b616063f
+7
-7
@@ -2418,7 +2418,7 @@ trigger:
|
|||||||
- docs/**
|
- docs/**
|
||||||
- latest.json
|
- latest.json
|
||||||
repo:
|
repo:
|
||||||
- grafana/grafana
|
- grafana/grafana-security-mirror
|
||||||
type: docker
|
type: docker
|
||||||
volumes:
|
volumes:
|
||||||
- host:
|
- host:
|
||||||
@@ -2599,7 +2599,7 @@ steps:
|
|||||||
- compile-build-cmd
|
- compile-build-cmd
|
||||||
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
|
||||||
@@ -2610,7 +2610,7 @@ steps:
|
|||||||
- compile-build-cmd
|
- compile-build-cmd
|
||||||
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
|
||||||
STATIC_ASSET_EDITIONS:
|
STATIC_ASSET_EDITIONS:
|
||||||
@@ -2623,7 +2623,7 @@ steps:
|
|||||||
- compile-build-cmd
|
- compile-build-cmd
|
||||||
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
|
||||||
@@ -2674,7 +2674,7 @@ steps:
|
|||||||
- yarn-install
|
- yarn-install
|
||||||
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
|
||||||
failure: ignore
|
failure: ignore
|
||||||
@@ -3181,7 +3181,7 @@ steps:
|
|||||||
environment:
|
environment:
|
||||||
BUCKET: grafana-prerelease
|
BUCKET: grafana-prerelease
|
||||||
GCP_KEY:
|
GCP_KEY:
|
||||||
from_secret: gcp_key
|
from_secret: gcp_upload_artifacts_key
|
||||||
failure: ignore
|
failure: ignore
|
||||||
image: google/cloud-sdk:431.0.0
|
image: google/cloud-sdk:431.0.0
|
||||||
name: gsutil-stat
|
name: gsutil-stat
|
||||||
@@ -4558,6 +4558,6 @@ kind: secret
|
|||||||
name: delivery-bot-app-private-key
|
name: delivery-bot-app-private-key
|
||||||
---
|
---
|
||||||
kind: signature
|
kind: signature
|
||||||
hmac: 0ef55963875ccd11735eba75f6db295f32742fa18aa9ab9c627b8dc21fc1f72d
|
hmac: 83a9327b3e6141e701aa900e9b7a1bebc7350727497749854c62f0e58d92957e
|
||||||
|
|
||||||
...
|
...
|
||||||
|
|||||||
@@ -108,7 +108,7 @@ def retrieve_npm_packages_step():
|
|||||||
],
|
],
|
||||||
"failure": "ignore",
|
"failure": "ignore",
|
||||||
"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": ["./bin/build artifacts npm retrieve --tag ${DRONE_TAG}"],
|
"commands": ["./bin/build artifacts npm retrieve --tag ${DRONE_TAG}"],
|
||||||
@@ -270,7 +270,7 @@ def publish_artifacts_step():
|
|||||||
"name": "publish-artifacts",
|
"name": "publish-artifacts",
|
||||||
"image": images["publish_image"],
|
"image": images["publish_image"],
|
||||||
"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": [
|
||||||
@@ -284,7 +284,7 @@ def publish_static_assets_step():
|
|||||||
"name": "publish-static-assets",
|
"name": "publish-static-assets",
|
||||||
"image": images["publish_image"],
|
"image": images["publish_image"],
|
||||||
"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"),
|
||||||
"STATIC_ASSET_EDITIONS": from_secret("static_asset_editions"),
|
"STATIC_ASSET_EDITIONS": from_secret("static_asset_editions"),
|
||||||
},
|
},
|
||||||
@@ -299,7 +299,7 @@ def publish_storybook_step():
|
|||||||
"name": "publish-storybook",
|
"name": "publish-storybook",
|
||||||
"image": images["publish_image"],
|
"image": images["publish_image"],
|
||||||
"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": [
|
||||||
@@ -438,7 +438,7 @@ def integration_test_pipelines():
|
|||||||
def verify_release_pipeline(
|
def verify_release_pipeline(
|
||||||
name = "verify-prerelease-assets",
|
name = "verify-prerelease-assets",
|
||||||
bucket = from_secret(prerelease_bucket),
|
bucket = from_secret(prerelease_bucket),
|
||||||
gcp_key = from_secret("gcp_key"),
|
gcp_key = from_secret(gcp_upload_artifacts_key),
|
||||||
version = "${DRONE_TAG}",
|
version = "${DRONE_TAG}",
|
||||||
trigger = release_trigger,
|
trigger = release_trigger,
|
||||||
depends_on = [
|
depends_on = [
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ trigger = {
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
"repo": [
|
"repo": [
|
||||||
"grafana/grafana",
|
"grafana/grafana-security-mirror",
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user