Grafana Charm

Merge ~xavpaice/charm-grafana:reduce_functests into charm-grafana:master

  1. Git
  2. lp:~xavpaice/charm-grafana
  3. reduce_functests
  4. Merge into master
Proposed by Xav Paice
Status: Merged
Approved by: James Troup
Approved revision: d00e0057451612e1af670ace0b571f1ccec4b74b
Merged at revision: d396f829a913b785e1c6c34a1c87b2c2b8fbd902
Proposed branch: ~xavpaice/charm-grafana:reduce_functests
Merge into: charm-grafana:master
Diff against target: 623 lines (+78/-243)
19 files modified
.gitignore (+4/-1)
Makefile (+11/-4)
charmcraft.yaml (+13/-6)
dev/null (+0/-1)
rename.sh (+13/-0)
src/README.md (+1/-1)
src/metadata.yaml (+1/-2)
src/tests/functional/tests/bundles/base.yaml (+8/-69)
src/tests/functional/tests/bundles/overlays/focal-self-signed-cert.yaml.j2 (+0/-22)
src/tests/functional/tests/bundles/overlays/focal-snap-self-signed-cert.yaml.j2 (+0/-22)
src/tests/functional/tests/bundles/overlays/focal-snap-tls.yaml.j2 (+0/-23)
src/tests/functional/tests/bundles/overlays/focal-snap.yaml.j2 (+0/-22)
src/tests/functional/tests/bundles/overlays/focal-tls.yaml.j2 (+0/-22)
src/tests/functional/tests/bundles/overlays/focal.yaml.j2 (+0/-22)
src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 (+2/-2)
src/tests/functional/tests/test_grafana.py (+16/-13)
src/tests/functional/tests/tests.yaml (+7/-10)
src/tests/unit/requirements.txt (+1/-0)
src/tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack continuous-integration Approve
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+416772@code.launchpad.net

Commit message

Reduce functests to a manageable set, with a smaller bundle.

Additionally improve Makefile and charmcraft.yaml.

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:65b559066a6b4966a8cb5c054419b18b39ad1d20
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/78/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/644/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1112/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/78//rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:076d7dd663431dc9c26e933f5428726d12bd33df
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/79/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/645/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1113/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/79//rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:2f41d01f1de72dfa9e95984f42c66432c820cfc6
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/80/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/647/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1115/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/80//rebuild

review: Approve (continuous-integration)
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision d396f829a913b785e1c6c34a1c87b2c2b8fbd902

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:d00e0057451612e1af670ace0b571f1ccec4b74b
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/83/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/654/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1122/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/83//rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/.gitignore b/.gitignore
2index 4bb6965..8958a94 100644
3--- a/.gitignore
4+++ b/.gitignore
5@@ -36,4 +36,7 @@ dist/
6 *.snap
7
8 # Builds
9-.build/
10\ No newline at end of file
11+.build/
12+builds/
13+build/
14+*.charm
15diff --git a/Makefile b/Makefile
16index 0a84b5f..1996d72 100644
17--- a/Makefile
18+++ b/Makefile
19@@ -10,6 +10,9 @@ endif
20 ifndef CHARM_INTERFACES_DIR
21 CHARM_INTERFACES_DIR=${PROJECTPATH}/interfaces
22 endif
23+ifdef CONTAINER
24+ BUILD_ARGS="--destructive-mode"
25+endif
26 METADATA_FILE="src/metadata.yaml"
27 CHARM_NAME=$(shell cat ${PROJECTPATH}/${METADATA_FILE} | grep -E "^name:" | awk '{print $$2}')
28
29@@ -35,6 +38,8 @@ clean:
30 @git clean -ffXd -e '!.idea'
31 @echo "Cleaning existing build"
32 @rm -rf ${CHARM_BUILD_DIR}/${CHARM_NAME}
33+ @charmcraft clean
34+ @rm -rf ${PROJECTPATH}/${CHARM_NAME}.charm
35
36 submodules:
37 # @git submodule update --init --recursive
38@@ -44,11 +49,13 @@ submodules-update:
39 # @git submodule update --init --recursive --remote --merge
40 @echo "No submodules. Skipping."
41
42-build:
43+build: clean
44 @echo "Building charm to directory ${CHARM_BUILD_DIR}/${CHARM_NAME}"
45 @-git rev-parse --abbrev-ref HEAD > ./src/repo-info
46- @CHARM_LAYERS_DIR=${CHARM_LAYERS_DIR} CHARM_INTERFACES_DIR=${CHARM_INTERFACES_DIR} \
47- TERM=linux CHARM_BUILD_DIR=${CHARM_BUILD_DIR} charm build src/
48+ @charmcraft -v pack ${BUILD_ARGS}
49+ @bash -c ./rename.sh
50+ @mkdir -p ${CHARM_BUILD_DIR}/${CHARM_NAME}
51+ @unzip ${PROJECTPATH}/${CHARM_NAME}.charm -d ${CHARM_BUILD_DIR}/${CHARM_NAME}
52
53 release: clean build
54 @echo "Charm is built at ${CHARM_BUILD_DIR}/${CHARM_NAME}"
55@@ -71,7 +78,7 @@ unittests:
56
57 functional: build
58 @echo "Executing functional tests in ${CHARM_BUILD_DIR}"
59- @cd src && CHARM_BUILD_DIR=${CHARM_BUILD_DIR} tox -e func
60+ @cd src && CHARM_LOCATION=${PROJECTPATH} tox -e func
61
62 test: lint proof unittests functional
63 @echo "Tests completed for charm ${CHARM_NAME}."
64diff --git a/charmcraft.yaml b/charmcraft.yaml
65index f0ffdaa..7d9c002 100644
66--- a/charmcraft.yaml
67+++ b/charmcraft.yaml
68@@ -5,9 +5,16 @@ parts:
69 plugin: reactive
70 build-snaps: [charm]
71 bases:
72- - name: ubuntu
73- channel: "20.04"
74- architectures: ["amd64"]
75- - name: ubuntu
76- channel: "18.04"
77- architectures: ["amd64"]
78+ - build-on:
79+ - name: ubuntu
80+ channel: "20.04"
81+ architectures: ["amd64"]
82+ run-on:
83+ - name: ubuntu
84+ channel: "20.04"
85+ architectures:
86+ - amd64
87+ - name: ubuntu
88+ channel: "18.04"
89+ architectures:
90+ - amd64
91diff --git a/rename.sh b/rename.sh
92new file mode 100755
93index 0000000..bc8697f
94--- /dev/null
95+++ b/rename.sh
96@@ -0,0 +1,13 @@
97+#!/bin/bash
98+charm=$(grep -E "^name:" src/metadata.yaml | awk '{print $2}')
99+echo "renaming ${charm}_*.charm to ${charm}.charm"
100+echo -n "pwd: "
101+pwd
102+ls -al
103+echo "Removing previous charm if it exists"
104+if [[ -e "${charm}.charm" ]];
105+then
106+ rm "${charm}.charm"
107+fi
108+echo "Renaming charm here."
109+mv ${charm}_*.charm ${charm}.charm
110diff --git a/src/README.md b/src/README.md
111index 4e2d009..1308bee 100644
112--- a/src/README.md
113+++ b/src/README.md
114@@ -167,7 +167,7 @@ ldap_config_flags: "{
115 After modifying code, you must assemble the charm:
116
117 ```
118-charm build
119+charmcraft pack
120 ```
121
122 ## Known Issues
123diff --git a/src/metadata.yaml b/src/metadata.yaml
124index ab20705..784d199 100644
125--- a/src/metadata.yaml
126+++ b/src/metadata.yaml
127@@ -7,7 +7,6 @@ description: |
128 series:
129 - focal
130 - bionic
131- - xenial
132 tags:
133 - misc
134 - monitoring
135@@ -24,4 +23,4 @@ requires:
136 dashboards:
137 interface: grafana-dashboard
138 application-dashboard:
139- interface: register-application
140\ No newline at end of file
141+ interface: register-application
142diff --git a/src/tests/functional/tests/bundles/base.yaml b/src/tests/functional/tests/bundles/base.yaml
143index 47354fa..10eeb46 100644
144--- a/src/tests/functional/tests/bundles/base.yaml
145+++ b/src/tests/functional/tests/bundles/base.yaml
146@@ -1,93 +1,32 @@
147 applications:
148 grafana:
149 num_units: 1
150- ceph-mon:
151- charm: cs:ceph-mon
152- num_units: 1
153- options:
154- expected-osd-count: 3
155- monitor-count: 1
156- ceph-osd:
157- charm: cs:ceph-osd
158- num_units: 3
159- options:
160- osd-devices: /srv/osd
161- use-direct-io: False
162- bluestore: False
163- glance:
164- charm: cs:glance
165- num_units: 1
166- options:
167- worker-multiplier: 0.1
168- keystone:
169- charm: cs:keystone
170- num_units: 1
171- options:
172- worker-multiplier: 0.1
173- mysql:
174- charm: cs:percona-cluster
175- num_units: 1
176- options:
177- max-connections: 1000
178- innodb-buffer-pool-size: 256M
179- tuning-level: fast
180- rabbitmq-server:
181- charm: cs:rabbitmq-server
182- num_units: 1
183- nagios:
184- charm: cs:nagios
185- num_units: 1
186+ charm: grafana
187 nrpe:
188- charm: cs:nrpe
189+ charm: nrpe
190 num_units: 0
191 prometheus:
192- charm: cs:~llama-charmers-next/prometheus2
193+ charm: prometheus2
194 num_units: 1
195 options:
196 label-juju-units: true
197 telegraf:
198- charm: cs:telegraf
199+ charm: telegraf
200 options:
201 prometheus_output_port: default
202- prometheus-ceph-exporter:
203- charm: cs:~llama-charmers-next/prometheus-ceph-exporter
204- num_units: 1
205- prometheus-libvirt-exporter:
206- charm: cs:~llama-charmers/prometheus-libvirt-exporter
207 ldap-server:
208 charm: cs:~openstack-charmers/ldap-test-fixture
209 num_units: 1
210+ series: bionic
211
212 relations:
213-- - keystone:shared-db
214- - mysql:shared-db
215-- - glance:identity-service
216- - keystone:identity-service
217-- - glance:shared-db
218- - mysql:shared-db
219-- - glance:amqp
220- - rabbitmq-server:amqp
221-- - ceph-mon:client
222- - glance:ceph
223-- - ceph-osd:mon
224- - ceph-mon:osd
225-- - prometheus-ceph-exporter
226- - ceph-mon:client
227 - - prometheus:target
228 - telegraf:prometheus-client
229-- - prometheus:target
230- - prometheus-ceph-exporter
231-- - telegraf
232- - ceph-mon
233 - - prometheus:grafana-source
234 - grafana:grafana-source
235 - - grafana:nrpe-external-master
236 - nrpe
237-- - prometheus-libvirt-exporter
238- - mysql
239-- - prometheus:target
240- - prometheus-libvirt-exporter
241+- - ldap-server:juju-info
242+ - telegraf:juju-info
243 - - grafana:dashboards
244- - prometheus-libvirt-exporter
245-- - nagios
246- - nrpe
247+ - telegraf:dashboards
248diff --git a/src/tests/functional/tests/bundles/overlays/focal-self-signed-cert.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal-self-signed-cert.yaml.j2
249index cbe4f51..146eb46 100644
250--- a/src/tests/functional/tests/bundles/overlays/focal-self-signed-cert.yaml.j2
251+++ b/src/tests/functional/tests/bundles/overlays/focal-self-signed-cert.yaml.j2
252@@ -3,25 +3,3 @@ applications:
253 grafana:
254 options:
255 install_method: apt
256- ceph-mon:
257- series: bionic
258- ceph-osd:
259- series: bionic
260- glance:
261- series: bionic
262- keystone:
263- series: bionic
264- mysql:
265- series: bionic
266- rabbitmq-server:
267- series: bionic
268- prometheus:
269- series: bionic
270- prometheus-ceph-exporter:
271- series: bionic
272- prometheus-libvirt-exporter:
273- series: bionic
274- nagios:
275- series: bionic
276- ldap-server:
277- series: bionic
278diff --git a/src/tests/functional/tests/bundles/overlays/focal-snap-self-signed-cert.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal-snap-self-signed-cert.yaml.j2
279index fafffe0..ba819f2 100644
280--- a/src/tests/functional/tests/bundles/overlays/focal-snap-self-signed-cert.yaml.j2
281+++ b/src/tests/functional/tests/bundles/overlays/focal-snap-self-signed-cert.yaml.j2
282@@ -5,25 +5,3 @@ applications:
283 options:
284 install_method: snap
285 snap_channel: 6/stable
286- ceph-mon:
287- series: bionic
288- ceph-osd:
289- series: bionic
290- glance:
291- series: bionic
292- keystone:
293- series: bionic
294- mysql:
295- series: bionic
296- rabbitmq-server:
297- series: bionic
298- prometheus:
299- series: bionic
300- prometheus-ceph-exporter:
301- series: bionic
302- prometheus-libvirt-exporter:
303- series: bionic
304- nagios:
305- series: bionic
306- ldap-server:
307- series: bionic
308diff --git a/src/tests/functional/tests/bundles/overlays/focal-snap-tls.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal-snap-tls.yaml.j2
309index e0b8218..0873b8a 100644
310--- a/src/tests/functional/tests/bundles/overlays/focal-snap-tls.yaml.j2
311+++ b/src/tests/functional/tests/bundles/overlays/focal-snap-tls.yaml.j2
312@@ -1,32 +1,9 @@
313 series: focal
314 applications:
315 grafana:
316- num_units: 1
317 options:
318 install_method: snap
319 snap_channel: 6/stable
320- ceph-mon:
321- series: bionic
322- ceph-osd:
323- series: bionic
324- glance:
325- series: bionic
326- keystone:
327- series: bionic
328- mysql:
329- series: bionic
330- rabbitmq-server:
331- series: bionic
332- prometheus:
333- series: bionic
334- prometheus-ceph-exporter:
335- series: bionic
336- prometheus-libvirt-exporter:
337- series: bionic
338- nagios:
339- series: bionic
340- ldap-server:
341- series: bionic
342 easyrsa:
343 charm: cs:~containers/easyrsa
344 num_units: 1
345diff --git a/src/tests/functional/tests/bundles/overlays/focal-snap.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal-snap.yaml.j2
346index fafffe0..ba819f2 100644
347--- a/src/tests/functional/tests/bundles/overlays/focal-snap.yaml.j2
348+++ b/src/tests/functional/tests/bundles/overlays/focal-snap.yaml.j2
349@@ -5,25 +5,3 @@ applications:
350 options:
351 install_method: snap
352 snap_channel: 6/stable
353- ceph-mon:
354- series: bionic
355- ceph-osd:
356- series: bionic
357- glance:
358- series: bionic
359- keystone:
360- series: bionic
361- mysql:
362- series: bionic
363- rabbitmq-server:
364- series: bionic
365- prometheus:
366- series: bionic
367- prometheus-ceph-exporter:
368- series: bionic
369- prometheus-libvirt-exporter:
370- series: bionic
371- nagios:
372- series: bionic
373- ldap-server:
374- series: bionic
375diff --git a/src/tests/functional/tests/bundles/overlays/focal-tls.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal-tls.yaml.j2
376index 46465c3..7a2ed61 100644
377--- a/src/tests/functional/tests/bundles/overlays/focal-tls.yaml.j2
378+++ b/src/tests/functional/tests/bundles/overlays/focal-tls.yaml.j2
379@@ -4,28 +4,6 @@ applications:
380 num_units: 1
381 options:
382 install_method: apt
383- ceph-mon:
384- series: bionic
385- ceph-osd:
386- series: bionic
387- glance:
388- series: bionic
389- keystone:
390- series: bionic
391- mysql:
392- series: bionic
393- rabbitmq-server:
394- series: bionic
395- prometheus:
396- series: bionic
397- prometheus-ceph-exporter:
398- series: bionic
399- prometheus-libvirt-exporter:
400- series: bionic
401- nagios:
402- series: bionic
403- ldap-server:
404- series: bionic
405 easyrsa:
406 charm: cs:~containers/easyrsa
407 num_units: 1
408diff --git a/src/tests/functional/tests/bundles/overlays/focal.yaml.j2 b/src/tests/functional/tests/bundles/overlays/focal.yaml.j2
409index 139cc4d..7a91138 100644
410--- a/src/tests/functional/tests/bundles/overlays/focal.yaml.j2
411+++ b/src/tests/functional/tests/bundles/overlays/focal.yaml.j2
412@@ -4,25 +4,3 @@ applications:
413 num_units: 1
414 options:
415 install_method: apt
416- ceph-mon:
417- series: bionic
418- ceph-osd:
419- series: bionic
420- glance:
421- series: bionic
422- keystone:
423- series: bionic
424- mysql:
425- series: bionic
426- rabbitmq-server:
427- series: bionic
428- prometheus:
429- series: bionic
430- prometheus-ceph-exporter:
431- series: bionic
432- prometheus-libvirt-exporter:
433- series: bionic
434- nagios:
435- series: bionic
436- ldap-server:
437- series: bionic
438diff --git a/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
439index e48565a..45065bc 100644
440--- a/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
441+++ b/src/tests/functional/tests/bundles/overlays/local-charm-overlay.yaml.j2
442@@ -1,3 +1,3 @@
443 applications:
444- grafana:
445- charm: "{{ CHARM_BUILD_DIR }}/{{ charm_name }}"
446+ {{ charm_name }}:
447+ charm: "{{ CHARM_LOCATION }}/{{ charm_name }}.charm"
448diff --git a/src/tests/functional/tests/bundles/overlays/xenial-tls.yaml.j2 b/src/tests/functional/tests/bundles/overlays/xenial-tls.yaml.j2
449deleted file mode 100644
450index 1c1e894..0000000
451--- a/src/tests/functional/tests/bundles/overlays/xenial-tls.yaml.j2
452+++ /dev/null
453@@ -1,14 +0,0 @@
454-series: xenial
455-applications:
456- grafana:
457- options:
458- install_method: apt
459- easyrsa:
460- # Use bionic version as easyrsa is failing to install on xenial
461- series: bionic
462- charm: cs:~containers/easyrsa
463- num_units: 1
464- ldap-server:
465- series: bionic
466-relations:
467- - [ grafana:certificates, easyrsa ]
468diff --git a/src/tests/functional/tests/bundles/overlays/xenial.yaml.j2 b/src/tests/functional/tests/bundles/overlays/xenial.yaml.j2
469deleted file mode 100644
470index b3dd868..0000000
471--- a/src/tests/functional/tests/bundles/overlays/xenial.yaml.j2
472+++ /dev/null
473@@ -1,7 +0,0 @@
474-series: xenial
475-applications:
476- grafana:
477- options:
478- install_method: apt
479- ldap-server:
480- series: bionic
481diff --git a/src/tests/functional/tests/bundles/xenial-tls.yaml b/src/tests/functional/tests/bundles/xenial-tls.yaml
482deleted file mode 120000
483index f81f6ff..0000000
484--- a/src/tests/functional/tests/bundles/xenial-tls.yaml
485+++ /dev/null
486@@ -1 +0,0 @@
487-base.yaml
488\ No newline at end of file
489diff --git a/src/tests/functional/tests/bundles/xenial.yaml b/src/tests/functional/tests/bundles/xenial.yaml
490deleted file mode 120000
491index f81f6ff..0000000
492--- a/src/tests/functional/tests/bundles/xenial.yaml
493+++ /dev/null
494@@ -1 +0,0 @@
495-base.yaml
496\ No newline at end of file
497diff --git a/src/tests/functional/tests/test_grafana.py b/src/tests/functional/tests/test_grafana.py
498index 30dbe9e..69746e3 100644
499--- a/src/tests/functional/tests/test_grafana.py
500+++ b/src/tests/functional/tests/test_grafana.py
501@@ -278,7 +278,7 @@ class CharmOperationTest(BaseGrafanaTest):
502 def test_10_grafana_imported_dashboards(self):
503 """Check that Grafana dashboards expected are there."""
504 dashboards = self.get_and_check_dashboards(lambda dashes: len(dashes) >= 4)
505- self.assertTrue(len(dashboards) >= 4)
506+ self.assertTrue(len(dashboards) >= 1)
507 self.assertTrue(
508 all(
509 dash.get("type", "") == "dash-db"
510@@ -287,35 +287,36 @@ class CharmOperationTest(BaseGrafanaTest):
511 )
512 )
513
514+ # TODO change to telegraf
515 def test_11_dashboard_upgrade(self):
516 """Test upgraded dashboards are imported."""
517- exporter = "prometheus-libvirt-exporter/0"
518+ telegraf = "telegraf/0"
519 self.remote_sed(
520- exporter,
521- "/var/lib/juju/agents/unit-prometheus-libvirt-exporter-0/charm/"
522- "files/grafana-dashboards/libvirt.json",
523- "s/Libvirt/FunctionalTestMarker/",
524+ telegraf,
525+ "/var/lib/juju/agents/unit-telegraf-0/charm/"
526+ "templates/dashboards/grafana/Telegraf.json.j2",
527+ "s/Telegraf/FunctionalTestMarker/",
528 )
529 model.run_on_unit(
530- exporter, "JUJU_HOOK_NAME=upgrade-charm ./hooks/upgrade-charm"
531+ telegraf, "JUJU_HOOK_NAME=upgrade-charm ./hooks/upgrade-charm"
532 )
533 model.block_until_all_units_idle()
534
535 def chk(dashes):
536 marker_dashes = [d for d in dashes if "FunctionalTestMarker" in d["title"]]
537- return len(dashes) >= 4 and len(marker_dashes) == 1
538+ return len(dashes) >= 1 and len(marker_dashes) == 1
539
540 dashes = self.get_and_check_dashboards(chk)
541 self.assertTrue(chk(dashes))
542
543 self.remote_sed(
544- exporter,
545- "/var/lib/juju/agents/unit-prometheus-libvirt-exporter-0/charm/"
546- "files/grafana-dashboards/libvirt.json",
547- "s/FunctionalTestMarker/Libvirt/",
548+ telegraf,
549+ "/var/lib/juju/agents/unit-telegraf-0/charm/"
550+ "templates/dashboards/grafana/Telegraf.json.j2",
551+ "s/FunctionalTestMarker/Telegraf/",
552 )
553 model.run_on_unit(
554- exporter, "JUJU_HOOK_NAME=upgrade-charm ./hooks/upgrade-charm"
555+ telegraf, "JUJU_HOOK_NAME=upgrade-charm ./hooks/upgrade-charm"
556 )
557 model.block_until_all_units_idle()
558
559@@ -391,6 +392,8 @@ class CharmOperationTest(BaseGrafanaTest):
560 deployment.
561
562 As per LP #1893320
563+
564+ Note: this test takes ~5 mins.
565 """
566 datasource_application = "prometheus"
567 new_port = "1234"
568diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
569index 638f2cd..3410cad 100644
570--- a/src/tests/functional/tests/tests.yaml
571+++ b/src/tests/functional/tests/tests.yaml
572@@ -5,22 +5,19 @@ configure:
573 - tests.setup.set_certificate
574
575 gate_bundles:
576- - model_apt_install: focal
577 - model_apt_install: focal-tls
578- - model_apt_install: bionic
579 - model_apt_install: bionic-tls
580- - model_apt_install: xenial
581- - model_apt_install: xenial-tls
582- - model_snap_install: bionic-snap
583- - model_snap_install: bionic-snap-tls
584- - model_snap_install: focal-snap
585- - model_snap_install: focal-snap-tls
586- - self_signed_cert: focal-snap-self-signed-cert
587 - self_signed_cert: focal-self-signed-cert
588 smoke_bundles:
589- - model_snap_install: bionic-snap
590+ - model_apt_install: focal
591 dev_bundles:
592+ - self_signed_cert: focal-snap-self-signed-cert
593+ - model_snap_install: bionic-snap-tls
594+ - model_snap_install: focal-snap-tls
595 - model_snap_install: bionic-snap
596+ - model_apt_install: bionic
597+ - model_snap_install: bionic-snap
598+ - model_snap_install: focal-snap
599 tests:
600 - model_snap_install:
601 - tests.test_grafana.CharmOperationTest
602diff --git a/src/tests/unit/requirements.txt b/src/tests/unit/requirements.txt
603index 42dfef1..ee4e952 100644
604--- a/src/tests/unit/requirements.txt
605+++ b/src/tests/unit/requirements.txt
606@@ -8,3 +8,4 @@ jsondiff
607 pbkdf2
608 pycrypto
609 netifaces
610+six
611diff --git a/src/tox.ini b/src/tox.ini
612index da68707..8bdf81e 100644
613--- a/src/tox.ini
614+++ b/src/tox.ini
615@@ -10,7 +10,7 @@ setenv =
616 passenv =
617 HOME
618 PATH
619- CHARM_BUILD_DIR
620+ CHARM_*
621 PYTEST_KEEP_MODEL
622 PYTEST_CLOUD_NAME
623 PYTEST_CLOUD_REGION

Subscribers

People subscribed via source and target branches

to all changes: