Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Grafana versions in tests #837

Merged
merged 2 commits into from
Mar 7, 2023
Merged

Bump Grafana versions in tests #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aa4e25
Bump Grafana versions in tests
julienduchesne Mar 7, 2023
d1431f4
Stop running team pref test in 9.4.0
julienduchesne Mar 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions .drone/drone.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
local grafanaVersions = ['9.3.2', '9.2.8', '9.1.8', '8.5.15', '7.5.17'];
local grafanaVersions = ['9.4.3', '9.3.8', '9.2.13', '8.5.21', '7.5.17'];
local images = {
go: 'golang:1.18',
python: 'python:3.9-alpine',
Expand Down Expand Up @@ -61,6 +61,16 @@ local pipeline(name, steps, services=[]) = {
},
};

local withConcurrencyLimit(limit) = {
concurrency: { limit: limit },
};

local onPromoteTrigger = {
trigger: {
event: ['promote'],
},
};

[
pipeline(
'lint', steps=[
Expand Down Expand Up @@ -145,12 +155,9 @@ local pipeline(name, steps, services=[]) = {
},
},
]
) + {
trigger: {
event: ['promote'],
},
concurrency: { limit: 1 },
},
)
+ withConcurrencyLimit(1)
+ onPromoteTrigger,

pipeline(
'cloud instance tests',
Expand Down Expand Up @@ -178,9 +185,8 @@ local pipeline(name, steps, services=[]) = {
},
},
]
) + {
concurrency: { limit: 1 },
},
)
+ withConcurrencyLimit(1),
]
+ [
pipeline(
Expand Down
26 changes: 13 additions & 13 deletions .drone/drone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,14 +165,14 @@ workspace:
path: /drone/terraform-provider-grafana
---
kind: pipeline
name: 'oss tests: 9.3.2'
name: 'oss tests: 9.4.3'
platform:
arch: amd64
os: linux
services:
- environment:
GF_DATABASE_URL: sqlite3:///var/lib/grafana/grafana.db?cache=private&mode=rwc&_journal_mode=WAL
image: grafana/grafana:9.3.2
image: grafana/grafana:9.4.3
name: grafana
steps:
- commands:
Expand All @@ -187,7 +187,7 @@ steps:
GRAFANA_AUTH: admin:admin
GRAFANA_ORG_ID: 1
GRAFANA_URL: http://grafana:3000
GRAFANA_VERSION: 9.3.2
GRAFANA_VERSION: 9.4.3
TF_ACC_TERRAFORM_PATH: /drone/terraform-provider-grafana/terraform
image: golang:1.18
name: tests
Expand All @@ -202,14 +202,14 @@ workspace:
path: /drone/terraform-provider-grafana
---
kind: pipeline
name: 'oss tests: 9.2.8'
name: 'oss tests: 9.3.8'
platform:
arch: amd64
os: linux
services:
- environment:
GF_DATABASE_URL: sqlite3:///var/lib/grafana/grafana.db?cache=private&mode=rwc&_journal_mode=WAL
image: grafana/grafana:9.2.8
image: grafana/grafana:9.3.8
name: grafana
steps:
- commands:
Expand All @@ -224,7 +224,7 @@ steps:
GRAFANA_AUTH: admin:admin
GRAFANA_ORG_ID: 1
GRAFANA_URL: http://grafana:3000
GRAFANA_VERSION: 9.2.8
GRAFANA_VERSION: 9.3.8
TF_ACC_TERRAFORM_PATH: /drone/terraform-provider-grafana/terraform
image: golang:1.18
name: tests
Expand All @@ -239,14 +239,14 @@ workspace:
path: /drone/terraform-provider-grafana
---
kind: pipeline
name: 'oss tests: 9.1.8'
name: 'oss tests: 9.2.13'
platform:
arch: amd64
os: linux
services:
- environment:
GF_DATABASE_URL: sqlite3:///var/lib/grafana/grafana.db?cache=private&mode=rwc&_journal_mode=WAL
image: grafana/grafana:9.1.8
image: grafana/grafana:9.2.13
name: grafana
steps:
- commands:
Expand All @@ -261,7 +261,7 @@ steps:
GRAFANA_AUTH: admin:admin
GRAFANA_ORG_ID: 1
GRAFANA_URL: http://grafana:3000
GRAFANA_VERSION: 9.1.8
GRAFANA_VERSION: 9.2.13
TF_ACC_TERRAFORM_PATH: /drone/terraform-provider-grafana/terraform
image: golang:1.18
name: tests
Expand All @@ -276,14 +276,14 @@ workspace:
path: /drone/terraform-provider-grafana
---
kind: pipeline
name: 'oss tests: 8.5.15'
name: 'oss tests: 8.5.21'
platform:
arch: amd64
os: linux
services:
- environment:
GF_DATABASE_URL: sqlite3:///var/lib/grafana/grafana.db?cache=private&mode=rwc&_journal_mode=WAL
image: grafana/grafana:8.5.15
image: grafana/grafana:8.5.21
name: grafana
steps:
- commands:
Expand All @@ -298,7 +298,7 @@ steps:
GRAFANA_AUTH: admin:admin
GRAFANA_ORG_ID: 1
GRAFANA_URL: http://grafana:3000
GRAFANA_VERSION: 8.5.15
GRAFANA_VERSION: 8.5.21
TF_ACC_TERRAFORM_PATH: /drone/terraform-provider-grafana/terraform
image: golang:1.18
name: tests
Expand Down Expand Up @@ -386,6 +386,6 @@ kind: secret
name: grafana-sm-token
---
kind: signature
hmac: 704130d97109eeb943529e12dd37ac883795b94803967dce71317e57526c5b05
hmac: 7ab2509c5c2bafb65a9efd5ac3cad08d9af6514714c7e4d7b6865c2dfe97ea07

...
2 changes: 1 addition & 1 deletion GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GRAFANA_VERSION ?= 9.3.2
GRAFANA_VERSION ?= 9.4.3

testacc:
TF_ACC=1 go test ./... -v $(TESTARGS) -timeout 120m
Expand Down
1 change: 1 addition & 0 deletions internal/resources/grafana/zzz_deprecated_resource_team_preferences_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (

func TestAccTeamPreferences_basic(t *testing.T) {
testutils.CheckOSSTestsEnabled(t)
testutils.CheckOSSTestsSemver(t, "<9.4.0") // Home dashboard ID is removed in 9.4.0, and this resource is deprecated in favor of `grafana_team.preferences`

resource.ParallelTest(t, resource.TestCase{
ProviderFactories: testutils.ProviderFactories,
Expand Down