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

* 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)

* make drone
This commit is contained in:
Kevin Minehart
2023-11-01 09:50:49 -07:00
committed by GitHub
parent 65b5a97601
commit b19f02fa88
3 changed files with 100 additions and 99 deletions
+98 -98
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:
@@ -301,7 +301,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.'
@@ -310,21 +310,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
@@ -333,7 +333,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:
@@ -382,7 +382,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
@@ -409,7 +409,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
@@ -418,7 +418,7 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: lint-backend
trigger:
event:
@@ -474,7 +474,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
@@ -484,7 +484,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.'
@@ -493,14 +493,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
@@ -533,7 +533,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
@@ -818,7 +818,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
@@ -832,7 +832,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.'
@@ -841,14 +841,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
@@ -869,7 +869,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
@@ -890,7 +890,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
@@ -911,7 +911,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
@@ -926,7 +926,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
@@ -941,7 +941,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
@@ -958,7 +958,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:
@@ -1044,7 +1044,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:
@@ -1084,7 +1084,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
@@ -1191,7 +1191,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
@@ -1202,7 +1202,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.'
@@ -1212,14 +1212,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
@@ -1227,7 +1227,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
@@ -1239,7 +1239,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
@@ -1250,7 +1250,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
@@ -1261,7 +1261,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:
@@ -1337,7 +1337,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
@@ -1494,7 +1494,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.'
@@ -1503,21 +1503,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
@@ -1526,7 +1526,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
@@ -1570,13 +1570,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
@@ -1585,7 +1585,7 @@ steps:
- wire-install
environment:
CGO_ENABLED: "1"
image: golang:1.20.10-alpine
image: golang:1.21.3-alpine
name: lint-backend
- commands:
- ./bin/build verify-drone
@@ -1641,7 +1641,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
@@ -1651,7 +1651,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.'
@@ -1660,14 +1660,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
@@ -1699,7 +1699,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
@@ -1885,7 +1885,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
@@ -2082,7 +2082,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
@@ -2096,7 +2096,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.'
@@ -2105,14 +2105,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
@@ -2133,7 +2133,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
@@ -2154,7 +2154,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
@@ -2175,7 +2175,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
@@ -2190,7 +2190,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
@@ -2205,7 +2205,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
@@ -2222,7 +2222,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
@@ -2412,7 +2412,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
@@ -2508,7 +2508,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}
@@ -2577,7 +2577,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
@@ -2606,7 +2606,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:
@@ -2642,7 +2642,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
@@ -2748,7 +2748,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:
@@ -2805,13 +2805,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:
@@ -2911,7 +2911,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.'
@@ -2920,21 +2920,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
@@ -2943,7 +2943,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:
@@ -2999,7 +2999,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:
@@ -3179,7 +3179,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:
@@ -3325,7 +3325,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.'
@@ -3334,21 +3334,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
@@ -3357,7 +3357,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:
@@ -3411,7 +3411,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:
@@ -3557,7 +3557,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:
@@ -3654,20 +3654,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:
@@ -3759,7 +3759,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.'
@@ -3768,14 +3768,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
@@ -3796,7 +3796,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
@@ -3817,7 +3817,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
@@ -3838,7 +3838,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
@@ -3853,7 +3853,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
@@ -3868,7 +3868,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
@@ -3885,7 +3885,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:
@@ -4291,7 +4291,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
@@ -4325,7 +4325,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
@@ -4573,6 +4573,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: b62d31b05e01279b55e4d29aeb12248dd8f7b399d72a72ff827e3d5d2c4869b0
hmac: 317357c169e0d0b857d21f215664d5d0ef4c01585691c48281a18bdec54b974d
...
+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"