Skip to content

Commit

Permalink
[v10.0.x] CI: Fix verify-prerelease-assets pipeline (#72232)
Browse files Browse the repository at this point in the history
CI: Fix verify-prerelease-assets pipeline (#72226)

* Fix verify-prerelease-assets pipeline

* Comment out unused assets

(cherry picked from commit 142cbc2)
  • Loading branch information
guicaulada committed Jul 25, 2023
1 parent 4095259 commit eb8dd72
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
12 changes: 7 additions & 5 deletions .drone.yml
Expand Up @@ -3059,15 +3059,16 @@ steps:
- apt-get update && apt-get install -yq gettext
- printenv GCP_KEY | base64 -d > /tmp/key.json
- gcloud auth activate-service-account --key-file=/tmp/key.json
- '! ./scripts/list-release-artifacts.sh ${DRONE_TAG} | xargs -n1 gsutil stat |
grep "No URLs matched"'
- ./scripts/list-release-artifacts.sh ${DRONE_TAG} | xargs -n1 gsutil stat >> /tmp/stat.log
- '! cat /tmp/stat.log | grep "No URLs matched"'
depends_on:
- clone
environment:
BUCKET:
from_secret: prerelease_bucket
GCP_KEY:
from_secret: gcp_key
failure: ignore
image: google/cloud-sdk:431.0.0
name: gsutil-stat
trigger:
Expand Down Expand Up @@ -3332,14 +3333,15 @@ steps:
- apt-get update && apt-get install -yq gettext
- printenv GCP_KEY | base64 -d > /tmp/key.json
- gcloud auth activate-service-account --key-file=/tmp/key.json
- '! ./scripts/list-release-artifacts.sh ${DRONE_TAG} | xargs -n1 gsutil stat |
grep "No URLs matched"'
- ./scripts/list-release-artifacts.sh ${DRONE_TAG} | xargs -n1 gsutil stat >> /tmp/stat.log
- '! cat /tmp/stat.log | grep "No URLs matched"'
depends_on:
- clone
environment:
BUCKET: grafana-prerelease-dev
GCP_KEY:
from_secret: gcp_key
failure: ignore
image: google/cloud-sdk:431.0.0
name: gsutil-stat
trigger:
Expand Down Expand Up @@ -4610,6 +4612,6 @@ kind: secret
name: delivery-bot-app-private-key
---
kind: signature
hmac: c149d78d17febb676b27e85a82158b94fb794931ce88b7b8cae7b40c9f5cd5a3
hmac: fcf3c6f58b564b3ca60bb9ba1d5c9e6dd167f2661e591f3c37c0f32a3ec9df3e

...
4 changes: 3 additions & 1 deletion scripts/drone/events/release.star
Expand Up @@ -461,8 +461,10 @@ def verify_release_pipeline(
"apt-get update && apt-get install -yq gettext",
"printenv GCP_KEY | base64 -d > /tmp/key.json",
"gcloud auth activate-service-account --key-file=/tmp/key.json",
"! ./scripts/list-release-artifacts.sh {} | xargs -n1 gsutil stat | grep \"No URLs matched\"".format(version),
"./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,
Expand Down
5 changes: 4 additions & 1 deletion scripts/list-release-artifacts.sh
Expand Up @@ -5,8 +5,11 @@ VERSION="${1:-v9.5.2}"
ERSION="${VERSION#*v}"
ERSION_DEB="${ERSION//-/\~}"

# Unused assets:
# gs://${BUCKET}/artifacts/static-assets/grafana/${ERSION}/public/robots.txt
# gs://${BUCKET}/artifacts/static-assets/grafana-oss/${ERSION}/public/robots.txt

ASSETS=$(cat << EOF
gs://${BUCKET}/artifacts/static-assets/grafana-oss/${ERSION}/public/robots.txt
gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana-${ERSION_DEB}-1.aarch64.rpm
gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana-${ERSION_DEB}-1.aarch64.rpm.sha256
gs://${BUCKET}/artifacts/downloads/${VERSION}/oss/release/grafana-${ERSION_DEB}-1.armhfp.rpm
Expand Down

0 comments on commit eb8dd72

Please sign in to comment.