Merge ~canonical-is-bootstack/charm-grafana:fix/remove-trusty-support into charm-grafana:master

Proposed by Alvaro Uria
Status: Merged
Merged at revision: 2c87af7f9fe2750aa20455f2e86c9b17919512b7
Proposed branch: ~canonical-is-bootstack/charm-grafana:fix/remove-trusty-support
Merge into: charm-grafana:master
Diff against target: 39 lines (+2/-5)
2 files modified
metadata.yaml (+2/-3)
tests/functional/test_deploy.py (+0/-2)
Reviewer Review Type Date Requested Status
Alvaro Uria (community) Approve
Review via email: mp+380010@code.launchpad.net

Commit message

Remove trusty support

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
Alvaro Uria (aluria) wrote :

trivial change to remove trusty support. Functional tests have been run and all passed.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/metadata.yaml b/metadata.yaml
2index f5a762b..54efd4f 100644
3--- a/metadata.yaml
4+++ b/metadata.yaml
5@@ -1,14 +1,13 @@
6 name: grafana
7 summary: Graph and Dashboard builder
8-maintainer: Prometheus Charmers <prometheus-charmers@lists.launchpad.net>
9+maintainer: LMA Charmers <llama-charmers@lists.ubuntu.com>
10 description: |
11 Grafana is the leading graph and dashboard builder for visualizing
12 time series metrics.
13 series:
14- - xenial
15 - bionic
16 - focal
17- - trusty
18+ - xenial
19 tags:
20 - misc
21 - monitoring
22diff --git a/tests/functional/test_deploy.py b/tests/functional/test_deploy.py
23index 45dbc16..11447b7 100644
24--- a/tests/functional/test_deploy.py
25+++ b/tests/functional/test_deploy.py
26@@ -21,7 +21,6 @@ OVERLAY_PATH = os.path.join(CHARM_BUILD_DIR, "..", "overlay.yaml")
27 APP_SERIES = [
28 "xenial",
29 "bionic",
30- # "trusty", # not supported in LXD containers
31 ]
32 FAKE_INSTALL_METHOD = 'wrong-method'
33 INSTALL_METHOD = {
34@@ -39,7 +38,6 @@ APP_SERIES_INSTALL_METHOD_MAP = [
35 [series, install_method]
36 for series in APP_SERIES
37 for install_method in INSTALL_METHOD
38- if [series, install_method] != ["trusty", "snap"] # snaps not supported in trusty
39 ]
40
41

Subscribers

People subscribed via source and target branches

to all changes: