mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
CI: fix docker tag format on main
branch and missing dependency on ci-frontend-metrics.sh
(#74753)
* On main, set the docker tag format to be the same as it is in PRs * Install bash when trying to push frontend metrics
This commit is contained in:
parent
e9a12598db
commit
9221822dfe
@ -1878,6 +1878,7 @@ steps:
|
||||
repo:
|
||||
- grafana/grafana
|
||||
- commands:
|
||||
- apk add --update bash
|
||||
- ./scripts/ci-frontend-metrics.sh | ./bin/build publish-metrics $${GRAFANA_MISC_STATS_API_KEY}
|
||||
depends_on:
|
||||
- test-a11y-frontend
|
||||
@ -1893,8 +1894,8 @@ steps:
|
||||
- commands:
|
||||
- /src/grafana-build docker --package=$(cat packages.txt | grep tar.gz | grep -v
|
||||
docker | grep -v sha256) --ubuntu-base=ubuntu:22.10 --alpine-base=alpine:3.17.1
|
||||
--tag-format='{{ .version }}-{{ .arch }}' --ubuntu-tag-format='{{ .version }}-ubuntu-{{
|
||||
.arch }}' > docker.txt
|
||||
--tag-format='{{ .version_base }}-{{ .buildID }}-{{ .arch }}' --ubuntu-tag-format='{{
|
||||
.version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}' > docker.txt
|
||||
- find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
|
||||
depends_on:
|
||||
- rgm-package
|
||||
@ -4163,6 +4164,6 @@ kind: secret
|
||||
name: gcr_credentials
|
||||
---
|
||||
kind: signature
|
||||
hmac: 5ccdc60b94e3d992613fc1e978057a285d1858ea7db4f9daf87213f91212f1f3
|
||||
hmac: d3a519d45aa8abd7424ede359c024e5212341bcbc1a51e27cda1922a4e42877a
|
||||
|
||||
...
|
||||
|
@ -98,7 +98,13 @@ def build_e2e(trigger, ver_mode):
|
||||
[
|
||||
store_storybook_step(trigger = trigger_oss, ver_mode = ver_mode),
|
||||
frontend_metrics_step(trigger = trigger_oss),
|
||||
rgm_build_docker_step("packages.txt", images["ubuntu"], images["alpine"]),
|
||||
rgm_build_docker_step(
|
||||
"packages.txt",
|
||||
images["ubuntu"],
|
||||
images["alpine"],
|
||||
tag_format = "{{ .version_base }}-{{ .buildID }}-{{ .arch }}",
|
||||
ubuntu_tag_format = "{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}",
|
||||
),
|
||||
publish_images_step(
|
||||
docker_repo = "grafana",
|
||||
trigger = trigger_oss,
|
||||
|
@ -633,6 +633,7 @@ def frontend_metrics_step(trigger = None):
|
||||
},
|
||||
"failure": "ignore",
|
||||
"commands": [
|
||||
"apk add --update bash",
|
||||
"./scripts/ci-frontend-metrics.sh | ./bin/build publish-metrics $${GRAFANA_MISC_STATS_API_KEY}",
|
||||
],
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user