IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CI: Different secret for verification and do not ignore build failures (#73613)

Browse Source
This commit is contained in:
Horst Gutmann 2023-08-22 15:06:22 +02:00 committed by GitHub
parent 3256f7dd0c
commit 8fc3be6b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.drone.yml
View File

@ -3049,7 +3049,6 @@ steps:
from_secret: packages_gpg_private_key from_secret: packages_gpg_private_key
GPG_PUBLIC_KEY: GPG_PUBLIC_KEY:
from_secret: packages_gpg_public_key from_secret: packages_gpg_public_key
failure: ignore
image: grafana/grafana-build:main image: grafana/grafana-build:main
name: rgm-build name: rgm-build
volumes: volumes:
@ -3163,8 +3162,7 @@ steps:
environment: environment:
BUCKET: grafana-prerelease BUCKET: grafana-prerelease
GCP_KEY: GCP_KEY:
from_secret: gcp_upload_artifacts_key from_secret: gcp_key_base64
failure: ignore
image: google/cloud-sdk:431.0.0 image: google/cloud-sdk:431.0.0
name: gsutil-stat name: gsutil-stat
trigger: trigger:
@ -4546,6 +4544,6 @@ kind: secret
name: delivery-bot-app-private-key name: delivery-bot-app-private-key
--- ---
kind: signature kind: signature
hmac: da71a34a4dca17f08a083941cc4f8582abc5c855dca13382a54db96c23ea7e65 hmac: 5f0fb625d68170818a8dbfc073ed73f8dc1460906bebc49d6036f5f2fbc0aa9d
... ...

4
scripts/drone/events/release.star
View File

@ -57,6 +57,7 @@ load(
"gcp_upload_artifacts_key", "gcp_upload_artifacts_key",
"npm_token", "npm_token",
"prerelease_bucket", "prerelease_bucket",
"rgm_gcp_key_base64",
) )
load( load(
"scripts/drone/utils/images.star", "scripts/drone/utils/images.star",
@ -439,7 +440,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_upload_artifacts_key), gcp_key = from_secret(rgm_gcp_key_base64),
version = "${DRONE_TAG}", version = "${DRONE_TAG}",
trigger = release_trigger, trigger = release_trigger,
depends_on = [ depends_on = [
@ -467,7 +468,6 @@ def verify_release_pipeline(
"./scripts/list-release-artifacts.sh {} | xargs -n1 gsutil stat >> /tmp/stat.log".format(version), "./scripts/list-release-artifacts.sh {} | xargs -n1 gsutil stat >> /tmp/stat.log".format(version),
"! cat /tmp/stat.log | grep \"No URLs matched\"", "! cat /tmp/stat.log | grep \"No URLs matched\"",
], ],
"failure": "ignore",
} }
return pipeline( return pipeline(
depends_on = depends_on, depends_on = depends_on,

9
scripts/drone/rgm.star
View File

@ -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 = { rgm_build_step = {
"name": "rgm-build", "name": "rgm-build",
"image": "grafana/grafana-build:main", "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 # 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. # In the future we should find a way to use dagger without mounting the docker socket.
"volumes": [{"name": "docker", "path": "/var/run/docker.sock"}], "volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
"failure": "ignore",
} }
if canFail:
rgm_build_step["failure"] = "ignore"
return [ return [
rgm_build_step, rgm_build_step,
@ -107,7 +108,7 @@ def rgm_main():
return pipeline( return pipeline(
name = "rgm-main-prerelease", name = "rgm-main-prerelease",
trigger = trigger, trigger = trigger,
steps = rgm_build(), steps = rgm_build(canFail = True),
depends_on = ["main-test-backend", "main-test-frontend"], depends_on = ["main-test-backend", "main-test-frontend"],
) )
@ -115,7 +116,7 @@ def rgm_tag():
return pipeline( return pipeline(
name = "rgm-tag-prerelease", name = "rgm-tag-prerelease",
trigger = tag_trigger, 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"], depends_on = ["release-test-backend", "release-test-frontend"],
) )