diff --git a/.drone.yml b/.drone.yml index bcdfccc5798..270af8b836c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2679,7 +2679,6 @@ steps: from_secret: packages_gpg_private_key GPG_PUBLIC_KEY: from_secret: packages_gpg_public_key - failure: ignore image: grafana/grafana-build:main name: rgm-build volumes: @@ -2793,8 +2792,7 @@ steps: environment: BUCKET: grafana-prerelease GCP_KEY: - from_secret: gcp_upload_artifacts_key - failure: ignore + from_secret: gcp_key_base64 image: google/cloud-sdk:431.0.0 name: gsutil-stat trigger: @@ -4069,6 +4067,6 @@ kind: secret name: github_token --- kind: signature -hmac: fff3d5d91e4e04599392c2b8d218f033b8cc71516f1d709d3dea44f365e0ddef +hmac: 9b5e423a156dbf97a60a85b2b6b260a732b6443c7212916e7650c97cdd9254a3 ... diff --git a/scripts/drone/events/release.star b/scripts/drone/events/release.star index c0a03d3d4e5..d1d12ba3a4f 100644 --- a/scripts/drone/events/release.star +++ b/scripts/drone/events/release.star @@ -55,6 +55,7 @@ load( "gcp_upload_artifacts_key", "npm_token", "prerelease_bucket", + "rgm_gcp_key_base64", ) load( "scripts/drone/utils/images.star", @@ -431,7 +432,7 @@ def integration_test_pipelines(): def verify_release_pipeline( name = "verify-prerelease-assets", bucket = from_secret(prerelease_bucket), - gcp_key = from_secret(gcp_upload_artifacts_key), + gcp_key = from_secret(rgm_gcp_key_base64), version = "${DRONE_TAG}", trigger = release_trigger, depends_on = [ @@ -459,7 +460,6 @@ def verify_release_pipeline( "./scripts/list-release-artifacts.sh {} | xargs -n1 gsutil stat >> /tmp/stat.log".format(version), "! cat /tmp/stat.log | grep \"No URLs matched\"", ], - "failure": "ignore", } return pipeline( depends_on = depends_on, diff --git a/scripts/drone/rgm.star b/scripts/drone/rgm.star index e6851373103..0721f76b32b 100644 --- a/scripts/drone/rgm.star +++ b/scripts/drone/rgm.star @@ -73,7 +73,7 @@ tag_trigger = { }, } -def rgm_build(script = "drone_publish_main.sh"): +def rgm_build(script = "drone_publish_main.sh", canFail = True): rgm_build_step = { "name": "rgm-build", "image": "grafana/grafana-build:main", @@ -85,8 +85,9 @@ def rgm_build(script = "drone_publish_main.sh"): # The docker socket is a requirement for running dagger programs # In the future we should find a way to use dagger without mounting the docker socket. "volumes": [{"name": "docker", "path": "/var/run/docker.sock"}], - "failure": "ignore", } + if canFail: + rgm_build_step["failure"] = "ignore" return [ rgm_build_step, @@ -107,7 +108,7 @@ def rgm_main(): return pipeline( name = "rgm-main-prerelease", trigger = trigger, - steps = rgm_build(), + steps = rgm_build(canFail = True), depends_on = ["main-test-backend", "main-test-frontend"], ) @@ -115,7 +116,7 @@ def rgm_tag(): return pipeline( name = "rgm-tag-prerelease", trigger = tag_trigger, - steps = rgm_build(script = "drone_publish_tag_grafana.sh"), + steps = rgm_build(script = "drone_publish_tag_grafana.sh", canFail = False), depends_on = ["release-test-backend", "release-test-frontend"], )