File tree Expand file tree Collapse file tree 4 files changed +3
-14
lines changed Expand file tree Collapse file tree 4 files changed +3
-14
lines changed Original file line number Diff line number Diff line change @@ -6,6 +6,7 @@ grafana-wtf changelog
6
6
in progress
7
7
===========
8
8
- Upgrade to ``colored==1.4.3 ``
9
+ - Tests: Use ``.env `` file for propagating environment variables to Docker Compose
9
10
10
11
2021-10-01 0.10.0
11
12
=================
Original file line number Diff line number Diff line change
1
+ GRAFANA_VERSION = 8.3.1
Original file line number Diff line number Diff line change @@ -13,19 +13,6 @@ def clean_environment():
13
13
pass
14
14
15
15
16
- def update_environment ():
17
-
18
- # Set default Grafana version.
19
- GRAFANA_VERSION_DEFAULT = "8.1.5"
20
- if "GRAFANA_VERSION" not in os .environ :
21
- os .environ ["GRAFANA_VERSION" ] = GRAFANA_VERSION_DEFAULT
22
-
23
- # Report about Grafana version.
24
- GRAFANA_VERSION = os .environ ["GRAFANA_VERSION" ]
25
- sys .stderr .write (f"INFO: Running tests against Grafana version { GRAFANA_VERSION } \n " )
26
- sys .stderr .flush ()
27
-
28
-
29
16
@pytest .fixture (scope = "session" )
30
17
def docker_compose_files (pytestconfig ):
31
18
"""
@@ -51,4 +38,3 @@ def docker_grafana(docker_services):
51
38
52
39
53
40
clean_environment ()
54
- update_environment ()
Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ version: '3'
2
2
services :
3
3
4
4
grafana :
5
+ container_name : grafana-wtf-test
5
6
image : grafana/grafana:${GRAFANA_VERSION}
6
7
volumes :
7
8
- ./grafana/datasources:/etc/grafana/provisioning/datasources/
You can’t perform that action at this time.
0 commit comments