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 (community) 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
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 7d9c002..54381a0 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -14,7 +14,3 @@ bases:
14 channel: "20.04"14 channel: "20.04"
15 architectures:15 architectures:
16 - amd6416 - amd64
17 - name: ubuntu
18 channel: "18.04"
19 architectures:
20 - amd64
diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
index 7dba75f..20b78b3 100644
--- a/src/tests/functional/requirements.txt
+++ b/src/tests/functional/requirements.txt
@@ -1,4 +1,4 @@
1git+https://github.com/openstack-charmers/zaza.git#egg=zaza1git+https://github.com/openstack-charmers/zaza.git#egg=zaza
2python-openstackclient2python-openstackclient
3pyOpenSSL3pyOpenSSL<22.1.0 # https://github.com/pyca/pyopenssl/issues/1154
4tenacity4tenacity
diff --git a/src/tests/functional/tests/bundles/bionic-snap-tls.yaml b/src/tests/functional/tests/bundles/bionic-snap-tls.yaml
5deleted file mode 1200005deleted file mode 120000
index f81f6ff..0000000
--- a/src/tests/functional/tests/bundles/bionic-snap-tls.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/bionic-snap.yaml b/src/tests/functional/tests/bundles/bionic-snap.yaml
3deleted file mode 1200001deleted file mode 120000
index f81f6ff..0000000
--- a/src/tests/functional/tests/bundles/bionic-snap.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/bionic-tls.yaml b/src/tests/functional/tests/bundles/bionic-tls.yaml
3deleted file mode 1200001deleted file mode 120000
index f81f6ff..0000000
--- a/src/tests/functional/tests/bundles/bionic-tls.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml
3deleted file mode 1200001deleted file mode 120000
index f81f6ff..0000000
--- a/src/tests/functional/tests/bundles/bionic.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --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
3deleted file mode 1006441deleted file mode 100644
index e302099..0000000
--- a/src/tests/functional/tests/bundles/overlays/bionic-snap-tls.yaml.j2
+++ /dev/null
@@ -1,11 +0,0 @@
1series: bionic
2applications:
3 grafana:
4 options:
5 install_method: snap
6 snap_channel: 6/stable
7 easyrsa:
8 charm: cs:~containers/easyrsa
9 num_units: 1
10relations:
11 - [ grafana:certificates, easyrsa ]
diff --git a/src/tests/functional/tests/bundles/overlays/bionic-snap.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-snap.yaml.j2
12deleted file mode 1006440deleted file mode 100644
index 2ea3578..0000000
--- a/src/tests/functional/tests/bundles/overlays/bionic-snap.yaml.j2
+++ /dev/null
@@ -1,6 +0,0 @@
1series: bionic
2applications:
3 grafana:
4 options:
5 install_method: snap
6 snap_channel: 6/stable
diff --git a/src/tests/functional/tests/bundles/overlays/bionic-tls.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic-tls.yaml.j2
7deleted file mode 1006440deleted file mode 100644
index e728037..0000000
--- a/src/tests/functional/tests/bundles/overlays/bionic-tls.yaml.j2
+++ /dev/null
@@ -1,10 +0,0 @@
1series: bionic
2applications:
3 grafana:
4 options:
5 install_method: apt
6 easyrsa:
7 charm: cs:~containers/easyrsa
8 num_units: 1
9relations:
10 - [ grafana:certificates, easyrsa ]
diff --git a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
11deleted file mode 1006440deleted file mode 100644
index 7e68365..0000000
--- a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
+++ /dev/null
@@ -1,5 +0,0 @@
1series: bionic
2applications:
3 grafana:
4 options:
5 install_method: apt
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index 11d5fe9..b168402 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -7,16 +7,11 @@ configure:
7gate_bundles:7gate_bundles:
8 - model_snap_install: focal-snap-tls8 - model_snap_install: focal-snap-tls
9 - model_apt_install: focal-tls9 - model_apt_install: focal-tls
10 - model_apt_install: bionic-tls
11 - self_signed_cert: focal-self-signed-cert10 - self_signed_cert: focal-self-signed-cert
12smoke_bundles:11smoke_bundles:
13 - model_apt_install: focal12 - model_apt_install: focal
14dev_bundles:13dev_bundles:
15 - self_signed_cert: focal-snap-self-signed-cert14 - self_signed_cert: focal-snap-self-signed-cert
16 - model_snap_install: bionic-snap-tls
17 - model_snap_install: bionic-snap
18 - model_apt_install: bionic
19 - model_snap_install: bionic-snap
20 - model_snap_install: focal-snap15 - model_snap_install: focal-snap
21tests:16tests:
22 - model_snap_install:17 - model_snap_install:
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 732b9d8..659b39c 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,2 +1,7 @@
1requests<2.25.01requests<2.25.0
2jsondiff2jsondiff
3# https://github.com/juju-solutions/layer-basic/issues/210
4Jinja2<3.0;python_version == '3.8'
5MarkupSafe<2.1.0;python_version == '3.8'
6setuptools<42;python_version == '3.8'
7setuptools-scm<=1.17.0;python_version == '3.8'

Subscribers

People subscribed via source and target branches

to all changes: