Grafana Charm

Merge ~mertkirpici/charm-grafana:bseng/553 into charm-grafana:master

  1. Git
  2. lp:~mertkirpici/charm-grafana
  3. bseng/553
  4. Merge into master
Proposed by Mert Kirpici
Status: Merged
Approved by: Erhan Sunar
Approved revision: e465547a398382e3b68eed6390a8526c6fce48a4
Merged at revision: cf0434434b2708e0cae032ea29fc51886c2c4772
Proposed branch: ~mertkirpici/charm-grafana:bseng/553
Merge into: charm-grafana:master
Diff against target: 143 lines (+6/-15)
5 files modified
charmcraft.yaml (+0/-4)
dev/null (+0/-5)
src/tests/functional/requirements.txt (+1/-1)
src/tests/functional/tests/tests.yaml (+0/-5)
src/wheelhouse.txt (+5/-0)
Reviewer Review Type Date Requested Status
Erhan Sunar (community) Approve
Eric Chen Approve
🤖 prod-jenkaas-bootstack continuous-integration Needs Fixing
BootStack Reviewers Pending
Review via email: mp+433866@code.launchpad.net

Commit message

Drop bionic support

Description of the change

This MP works on:
- drop bionic support
- pin jinja2, setuptools and pyopenssl for a successful build. See commented issues in respective files for more info.

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 :

FAILED: Continuous integration, rev:e465547a398382e3b68eed6390a8526c6fce48a4
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/106/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1484/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1734/

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

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

FAILED: Continuous integration, rev:e465547a398382e3b68eed6390a8526c6fce48a4
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/107/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1486/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1736/

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

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

FAILED: Continuous integration, rev:e465547a398382e3b68eed6390a8526c6fce48a4
https://jenkins.canonical.com/bootstack/job/lp-charm-grafana-ci/108/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1494/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1742/

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Eric Chen (eric-chen) :
review: Approve
Revision history for this message
Erhan Sunar (esunar) :
review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision cf0434434b2708e0cae032ea29fc51886c2c4772

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/charmcraft.yaml b/charmcraft.yaml
2index 7d9c002..54381a0 100644
3--- a/charmcraft.yaml
4+++ b/charmcraft.yaml
5@@ -14,7 +14,3 @@ bases:
6 channel: "20.04"
7 architectures:
8 - amd64
9- - name: ubuntu
10- channel: "18.04"
11- architectures:
12- - amd64
13diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
14index 7dba75f..20b78b3 100644
15--- a/src/tests/functional/requirements.txt
16+++ b/src/tests/functional/requirements.txt
17@@ -1,4 +1,4 @@
18 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
19 python-openstackclient
20-pyOpenSSL
21+pyOpenSSL<22.1.0 # https://github.com/pyca/pyopenssl/issues/1154
22 tenacity
23diff --git a/src/tests/functional/tests/bundles/bionic-snap-tls.yaml b/src/tests/functional/tests/bundles/bionic-snap-tls.yaml
24deleted file mode 120000
25index f81f6ff..0000000
26--- a/src/tests/functional/tests/bundles/bionic-snap-tls.yaml
27+++ /dev/null
28@@ -1 +0,0 @@
29-base.yaml
30\ No newline at end of file
31diff --git a/src/tests/functional/tests/bundles/bionic-snap.yaml b/src/tests/functional/tests/bundles/bionic-snap.yaml
32deleted file mode 120000
33index f81f6ff..0000000
34--- a/src/tests/functional/tests/bundles/bionic-snap.yaml
35+++ /dev/null
36@@ -1 +0,0 @@
37-base.yaml
38\ No newline at end of file
39diff --git a/src/tests/functional/tests/bundles/bionic-tls.yaml b/src/tests/functional/tests/bundles/bionic-tls.yaml
40deleted file mode 120000
41index f81f6ff..0000000
42--- a/src/tests/functional/tests/bundles/bionic-tls.yaml
43+++ /dev/null
44@@ -1 +0,0 @@
45-base.yaml
46\ No newline at end of file
47diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml
48deleted file mode 120000
49index f81f6ff..0000000
50--- a/src/tests/functional/tests/bundles/bionic.yaml
51+++ /dev/null
52@@ -1 +0,0 @@
53-base.yaml
54\ No newline at end of file
55diff --git a/src/tests/functional/tests/bundles/overlays/bionic-snap-tls.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-snap-tls.yaml.j2
56deleted file mode 100644
57index e302099..0000000
58--- a/src/tests/functional/tests/bundles/overlays/bionic-snap-tls.yaml.j2
59+++ /dev/null
60@@ -1,11 +0,0 @@
61-series: bionic
62-applications:
63- grafana:
64- options:
65- install_method: snap
66- snap_channel: 6/stable
67- easyrsa:
68- charm: cs:~containers/easyrsa
69- num_units: 1
70-relations:
71- - [ grafana:certificates, easyrsa ]
72diff --git a/src/tests/functional/tests/bundles/overlays/bionic-snap.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-snap.yaml.j2
73deleted file mode 100644
74index 2ea3578..0000000
75--- a/src/tests/functional/tests/bundles/overlays/bionic-snap.yaml.j2
76+++ /dev/null
77@@ -1,6 +0,0 @@
78-series: bionic
79-applications:
80- grafana:
81- options:
82- install_method: snap
83- snap_channel: 6/stable
84diff --git a/src/tests/functional/tests/bundles/overlays/bionic-tls.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-tls.yaml.j2
85deleted file mode 100644
86index e728037..0000000
87--- a/src/tests/functional/tests/bundles/overlays/bionic-tls.yaml.j2
88+++ /dev/null
89@@ -1,10 +0,0 @@
90-series: bionic
91-applications:
92- grafana:
93- options:
94- install_method: apt
95- easyrsa:
96- charm: cs:~containers/easyrsa
97- num_units: 1
98-relations:
99- - [ grafana:certificates, easyrsa ]
100diff --git a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
101deleted file mode 100644
102index 7e68365..0000000
103--- a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
104+++ /dev/null
105@@ -1,5 +0,0 @@
106-series: bionic
107-applications:
108- grafana:
109- options:
110- install_method: apt
111diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
112index 11d5fe9..b168402 100644
113--- a/src/tests/functional/tests/tests.yaml
114+++ b/src/tests/functional/tests/tests.yaml
115@@ -7,16 +7,11 @@ configure:
116 gate_bundles:
117 - model_snap_install: focal-snap-tls
118 - model_apt_install: focal-tls
119- - model_apt_install: bionic-tls
120 - self_signed_cert: focal-self-signed-cert
121 smoke_bundles:
122 - model_apt_install: focal
123 dev_bundles:
124 - self_signed_cert: focal-snap-self-signed-cert
125- - model_snap_install: bionic-snap-tls
126- - model_snap_install: bionic-snap
127- - model_apt_install: bionic
128- - model_snap_install: bionic-snap
129 - model_snap_install: focal-snap
130 tests:
131 - model_snap_install:
132diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
133index 732b9d8..659b39c 100644
134--- a/src/wheelhouse.txt
135+++ b/src/wheelhouse.txt
136@@ -1,2 +1,7 @@
137 requests<2.25.0
138 jsondiff
139+# https://github.com/juju-solutions/layer-basic/issues/210
140+Jinja2<3.0;python_version == '3.8'
141+MarkupSafe<2.1.0;python_version == '3.8'
142+setuptools<42;python_version == '3.8'
143+setuptools-scm<=1.17.0;python_version == '3.8'

Subscribers

People subscribed via source and target branches

to all changes: