[v10.1.x] CI: Fix race condition when building docker on main (#77510)

CI: Fix race condition when building docker on main (#77504)

* build docker after packages are updated

* use my branch for main pipelines for testing

* use my branch for main pipelines for testing

* use main instead now

* formatting

(cherry picked from commit f6d3238505)
This commit is contained in:
Kevin Minehart
2023-11-01 09:51:00 -07:00
committed by GitHub
parent fd9a2d3cc1
commit 770af668a3
3 changed files with 102 additions and 101 deletions
+100 -100
View File
@@ -24,7 +24,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- ./bin/build verify-drone
@@ -74,14 +74,14 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- go install github.com/bazelbuild/buildtools/buildifier@latest
- buildifier --lint=warn -mode=check -r .
depends_on:
- compile-build-cmd
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: lint-starlark
trigger:
event:
@@ -316,7 +316,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -325,21 +325,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -348,7 +348,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: test-backend-integration
trigger:
event:
@@ -397,7 +397,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- apk add --update curl jq bash
@@ -424,7 +424,7 @@ steps:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- apk add --update make build-base
@@ -433,11 +433,11 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: validate-modfile
trigger:
event:
@@ -493,7 +493,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -503,7 +503,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -512,14 +512,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- yarn install --immutable
@@ -552,7 +552,7 @@ steps:
from_secret: drone_token
- commands:
- /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
--go-version=1.20.10 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
--go-version=1.21.3 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
--grafana-dir=$$PWD > packages.txt
depends_on:
- yarn-install
@@ -837,7 +837,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@@ -851,7 +851,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -860,14 +860,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -888,7 +888,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -909,7 +909,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -930,7 +930,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@@ -945,7 +945,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -960,7 +960,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -977,7 +977,7 @@ steps:
AM_PASSWORD: test
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@@ -1063,7 +1063,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
trigger:
event:
@@ -1103,7 +1103,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- apt-get update -yq && apt-get install shellcheck
@@ -1210,7 +1210,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1221,7 +1221,7 @@ steps:
- CODEGEN_VERIFY=1 make gen-cue
depends_on:
- clone-enterprise
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1231,14 +1231,14 @@ steps:
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on:
- clone-enterprise
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- apk add --update build-base
@@ -1246,7 +1246,7 @@ steps:
- go test -v -run=^$ -benchmem -timeout=1h -count=8 -bench=. ${GO_PACKAGES}
depends_on:
- wire-install
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: sqlite-benchmark-integration-tests
- commands:
- apk add --update build-base
@@ -1258,7 +1258,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: postgres-benchmark-integration-tests
- commands:
- apk add --update build-base
@@ -1269,7 +1269,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: mysql-5.7-benchmark-integration-tests
- commands:
- apk add --update build-base
@@ -1280,7 +1280,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: mysql-8.0-benchmark-integration-tests
trigger:
event:
@@ -1356,7 +1356,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
trigger:
branch: main
@@ -1528,7 +1528,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1537,21 +1537,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -1560,7 +1560,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: test-backend-integration
trigger:
branch: main
@@ -1604,13 +1604,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- apk add --update make
- make gen-go
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- apk add --update make build-base
@@ -1619,11 +1619,11 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: lint-backend
- commands:
- go run scripts/modowners/modowners.go check go.mod
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: validate-modfile
- commands:
- ./bin/build verify-drone
@@ -1679,7 +1679,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
@@ -1689,7 +1689,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -1698,14 +1698,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- yarn install --immutable
@@ -1737,7 +1737,7 @@ steps:
name: build-frontend-packages
- commands:
- /src/grafana-build artifacts -a targz:grafana:linux/amd64 -a targz:grafana:linux/arm64
--go-version=1.20.10 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
--go-version=1.21.3 --yarn-cache=$$YARN_CACHE_FOLDER --build-id=$$DRONE_BUILD_NUMBER
--grafana-dir=$$PWD > packages.txt
depends_on:
- update-package-json-version
@@ -1923,7 +1923,7 @@ steps:
docker.txt
- find ./dist -name '*docker*.tar.gz' -type f | xargs -n1 docker load -i
depends_on:
- yarn-install
- update-package-json-version
image: grafana/grafana-build:main
name: rgm-build-docker
pull: always
@@ -2120,7 +2120,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- echo $DRONE_RUNNER_NAME
@@ -2134,7 +2134,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2143,14 +2143,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -2171,7 +2171,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -2192,7 +2192,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -2213,7 +2213,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@@ -2228,7 +2228,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -2243,7 +2243,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -2260,7 +2260,7 @@ steps:
AM_PASSWORD: test
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: remote-alertmanager-integration-tests
trigger:
branch: main
@@ -2450,7 +2450,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts docker fetch --edition oss
@@ -2546,7 +2546,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- ./bin/build artifacts packages --tag $${DRONE_TAG} --src-bucket $${PRERELEASE_BUCKET}
@@ -2615,7 +2615,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- yarn install --immutable
@@ -2644,7 +2644,7 @@ steps:
NPM_TOKEN:
from_secret: npm_token
failure: ignore
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: release-npm-packages
trigger:
event:
@@ -2680,7 +2680,7 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- depends_on:
- compile-build-cmd
@@ -2786,7 +2786,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.20.10
GO_VERSION: 1.21.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -2843,13 +2843,13 @@ steps:
depends_on: []
environment:
CGO_ENABLED: 0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: compile-build-cmd
- commands:
- ./bin/build whatsnew-checker
depends_on:
- compile-build-cmd
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: whats-new-checker
trigger:
event:
@@ -2949,7 +2949,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -2958,21 +2958,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -2981,7 +2981,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: test-backend-integration
trigger:
event:
@@ -3037,7 +3037,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.20.10
GO_VERSION: 1.21.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -3217,7 +3217,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.20.10
GO_VERSION: 1.21.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -3363,7 +3363,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3372,21 +3372,21 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- apk add --update build-base shared-mime-info shared-mime-info-lang
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: test-backend
- commands:
- apk add --update build-base
@@ -3395,7 +3395,7 @@ steps:
| grep -o '\(.*\)/' | sort -u)
depends_on:
- wire-install
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: test-backend-integration
trigger:
cron:
@@ -3449,7 +3449,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.20.10
GO_VERSION: 1.21.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -3595,7 +3595,7 @@ steps:
from_secret: gcp_key_base64
GITHUB_TOKEN:
from_secret: github_token
GO_VERSION: 1.20.10
GO_VERSION: 1.21.3
GPG_PASSPHRASE:
from_secret: packages_gpg_passphrase
GPG_PRIVATE_KEY:
@@ -3692,20 +3692,20 @@ steps:
- commands: []
depends_on:
- clone
image: golang:1.20.10-windowsservercore-1809
image: golang:1.21.3-windowsservercore-1809
name: windows-init
- commands:
- go install github.com/google/wire/cmd/wire@v0.5.0
- wire gen -tags oss ./pkg/server
depends_on:
- windows-init
image: golang:1.20.10-windowsservercore-1809
image: golang:1.21.3-windowsservercore-1809
name: wire-install
- commands:
- go test -tags requires_buildifer -short -covermode=atomic -timeout=5m ./pkg/...
depends_on:
- wire-install
image: golang:1.20.10-windowsservercore-1809
image: golang:1.21.3-windowsservercore-1809
name: test-backend
trigger:
event:
@@ -3797,7 +3797,7 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-cue
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-cue
- commands:
- '# It is required that generated jsonnet is committed and in sync with its inputs.'
@@ -3806,14 +3806,14 @@ steps:
- apk add --update make
- CODEGEN_VERIFY=1 make gen-jsonnet
depends_on: []
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: verify-gen-jsonnet
- commands:
- apk add --update make
- make gen-go
depends_on:
- verify-gen-cue
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: wire-install
- commands:
- dockerize -wait tcp://postgres:5432 -timeout 120s
@@ -3834,7 +3834,7 @@ steps:
GRAFANA_TEST_DB: postgres
PGPASSWORD: grafanatest
POSTGRES_HOST: postgres
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: postgres-integration-tests
- commands:
- dockerize -wait tcp://mysql57:3306 -timeout 120s
@@ -3855,7 +3855,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql57
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: mysql-5.7-integration-tests
- commands:
- dockerize -wait tcp://mysql80:3306 -timeout 120s
@@ -3876,7 +3876,7 @@ steps:
environment:
GRAFANA_TEST_DB: mysql
MYSQL_HOST: mysql80
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: mysql-8.0-integration-tests
- commands:
- dockerize -wait tcp://redis:6379 -timeout 120s
@@ -3891,7 +3891,7 @@ steps:
- wait-for-redis
environment:
REDIS_URL: redis://redis:6379/0
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: redis-integration-tests
- commands:
- dockerize -wait tcp://memcached:11211 -timeout 120s
@@ -3906,7 +3906,7 @@ steps:
- wait-for-memcached
environment:
MEMCACHED_HOSTS: memcached:11211
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: memcached-integration-tests
- commands:
- dockerize -wait tcp://mimir_backend:8080 -timeout 120s
@@ -3923,7 +3923,7 @@ steps:
AM_PASSWORD: test
AM_TENANT_ID: test
AM_URL: http://mimir_backend:8080
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: remote-alertmanager-integration-tests
trigger:
event:
@@ -4329,7 +4329,7 @@ steps:
path: /root/.docker/
- commands:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM alpine/git:2.40.1
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.20.10-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM golang:1.21.3-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM node:18.12.0-alpine
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM google/cloud-sdk:431.0.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/grafana-ci-deploy:1.3.3
@@ -4363,7 +4363,7 @@ steps:
path: /root/.docker/
- commands:
- trivy --exit-code 1 --severity HIGH,CRITICAL alpine/git:2.40.1
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.20.10-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL golang:1.21.3-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL node:18.12.0-alpine
- trivy --exit-code 1 --severity HIGH,CRITICAL google/cloud-sdk:431.0.0
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/grafana-ci-deploy:1.3.3
@@ -4611,6 +4611,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: 11e3d5633d1f15e9def2ec492b2f7b2be823bb6ced20e1181055828217c431f5
hmac: c092214746f21d38c59a37e82298ae7fe1af9ab0b651df3b7ea83938798dcc8c
...
+1
View File
@@ -113,6 +113,7 @@ def build_e2e(trigger, ver_mode):
rgm_build_docker_step(
images["ubuntu"],
images["alpine"],
depends_on = ["update-package-json-version"],
tag_format = "{{ .version_base }}-{{ .buildID }}-{{ .arch }}",
ubuntu_tag_format = "{{ .version_base }}-{{ .buildID }}-ubuntu-{{ .arch }}",
),
+1 -1
View File
@@ -3,7 +3,7 @@ global variables
"""
grabpl_version = "v3.0.42"
golang_version = "1.20.10"
golang_version = "1.21.3"
# nodejs_version should match what's in ".nvmrc", but without the v prefix.
nodejs_version = "18.12.0"