mirror of
https://github.com/grafana/grafana.git
synced 2024-12-25 00:20:34 -06:00
CI: Different secret for verification and do not ignore build failures (#73613)
This commit is contained in:
parent
3256f7dd0c
commit
8fc3be6b5a
@ -3049,7 +3049,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:
|
||||
@ -3163,8 +3162,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:
|
||||
@ -4546,6 +4544,6 @@ kind: secret
|
||||
name: delivery-bot-app-private-key
|
||||
---
|
||||
kind: signature
|
||||
hmac: da71a34a4dca17f08a083941cc4f8582abc5c855dca13382a54db96c23ea7e65
|
||||
hmac: 5f0fb625d68170818a8dbfc073ed73f8dc1460906bebc49d6036f5f2fbc0aa9d
|
||||
|
||||
...
|
||||
|
@ -57,6 +57,7 @@ load(
|
||||
"gcp_upload_artifacts_key",
|
||||
"npm_token",
|
||||
"prerelease_bucket",
|
||||
"rgm_gcp_key_base64",
|
||||
)
|
||||
load(
|
||||
"scripts/drone/utils/images.star",
|
||||
@ -439,7 +440,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 = [
|
||||
@ -467,7 +468,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,
|
||||
|
@ -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"],
|
||||
)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user