diff --git a/.drone.yml b/.drone.yml index 08edc94be02..c9ef8fbc923 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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: 4b854bf31ae658802188e1b11c4e8e927f6df9652041de3391bf13212d635106 +hmac: 71817f05d3304d517a34be42ba5773c12429ddf78a7ece0c2aa33db9f529fbc8 ... diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star index d1775d351eb..aa1968a41db 100644 --- a/scripts/drone/events/release.star +++ b/scripts/drone/events/release.star @@ -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}"], @@ -264,7 +264,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": [ @@ -278,7 +278,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"), }, @@ -293,7 +293,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": [ @@ -429,7 +429,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 = [ diff --git a/scripts/drone/pipelines/trigger_downstream.star b/scripts/drone/pipelines/trigger_downstream.star index d35e2ce090a..fdff59792ed 100644 --- a/scripts/drone/pipelines/trigger_downstream.star +++ b/scripts/drone/pipelines/trigger_downstream.star @@ -23,6 +23,9 @@ trigger = { "latest.json", ], }, + "repo": [ + "grafana/grafana-security-mirror", + ], } def enterprise_downstream_pipeline():