CI: Fixes for various main steps (#74768)

Fixes for various main steps
This commit is contained in:
Kevin Minehart
2023-09-13 00:44:33 +03:00
committed by GitHub
parent ac314855eb
commit 69737cba6d
7 changed files with 114 additions and 102 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -e
ERROR_COUNT="0"
+1 -1
View File
@@ -76,7 +76,7 @@ def build_e2e(trigger, ver_mode):
build_steps.extend(
[
build_frontend_package_step(),
rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"),
rgm_package_step(distros = "linux/amd64,linux/arm64,linux/arm/v7", file = "packages.txt"),
grafana_server_step(),
e2e_tests_step("dashboards-suite"),
e2e_tests_step("smoke-tests-suite"),
+2 -1
View File
@@ -29,8 +29,9 @@ trigger = {
def shellcheck_step():
return {
"name": "shellcheck",
"image": images["shellcheck"],
"image": images["ubuntu"],
"commands": [
"apt-get update -yq && apt-get install shellcheck",
"shellcheck -e SC1071 -e SC2162 scripts/**/*.sh",
],
}
+2 -2
View File
@@ -633,8 +633,8 @@ 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}",
"apk add --update bash grep",
"./scripts/ci-frontend-metrics.sh | ./bin/build publish-metrics $$GRAFANA_MISC_STATS_API_KEY",
],
}
if trigger:
+9 -1
View File
@@ -3,6 +3,11 @@ Individual steps that use 'grafana-build' to replace existing individual steps.
These aren't used in releases.
"""
load(
"scripts/drone/variables.star",
"golang_version",
)
# rgm_package_step will create a tar.gz for use in e2e tests or other PR testing related activities..
def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt"):
return {
@@ -12,6 +17,7 @@ def rgm_package_step(distros = "linux/amd64,linux/arm64", file = "packages.txt")
"depends_on": ["yarn-install"],
"commands": [
"/src/grafana-build package --distro={} ".format(distros) +
"--go-version={} ".format(golang_version) +
"--yarn-cache=$$YARN_CACHE_FOLDER " +
"--build-id=$$DRONE_BUILD_NUMBER " +
"--grafana-dir=$$PWD > {}".format(file),
@@ -28,7 +34,9 @@ def rgm_build_backend_step(distros = "linux/amd64,linux/arm64"):
"image": "grafana/grafana-build:main",
"pull": "always",
"commands": [
"/src/grafana-build build --distro={} --grafana-dir=$$PWD".format(distros),
"/src/grafana-build build " +
"--go-version={} ".format(golang_version) +
"--distro={} --grafana-dir=$$PWD".format(distros),
],
"volumes": [{"name": "docker", "path": "/var/run/docker.sock"}],
}
+1 -1
View File
@@ -3,7 +3,7 @@ global variables
"""
grabpl_version = "v3.0.41"
golang_version = "1.21.1"
golang_version = "1.20.8"
# nodejs_version should match what's in ".nvmrc", but without the v prefix.
nodejs_version = "18.12.0"