Prometheus Openstack Exporter Charm

Merge ~sudeephb/charm-prometheus-openstack-exporter:bionic_fix into charm-prometheus-openstack-exporter:master

  1. Git
  2. lp:~sudeephb/charm-prometheus-openstack-exporter
  3. bionic_fix
  4. Merge into master
Proposed by Sudeep Bhandari
Status: Merged
Approved by: Ramesh Sattaru
Approved revision: 4750b28938501d38c1ce44ccf00bbb2c15324e69
Merged at revision: 9361e4c109d1a21b183d7340b8259388dc2da770
Proposed branch: ~sudeephb/charm-prometheus-openstack-exporter:bionic_fix
Merge into: charm-prometheus-openstack-exporter:master
Diff against target: 34 lines (+9/-3)
2 files modified
charmcraft.yaml (+5/-1)
src/tox.ini (+4/-2)
Reviewer Review Type Date Requested Status
Tianqi Xiao (community) Approve
Robert Gildein Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+436309@code.launchpad.net

Commit message

Use charm v 2.x for bionic support

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

FAILED: Continuous integration, rev:b5d5370ae7521fd251e8dac8db3f6da69a464449
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-openstack-exporter-ci/17/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/329/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1941/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-openstack-exporter-ci/17//rebuild

review: Needs Fixing (continuous-integration)
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 :

PASSED: Continuous integration, rev:4750b28938501d38c1ce44ccf00bbb2c15324e69
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-openstack-exporter-ci/18/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/330/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1944/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-openstack-exporter-ci/18//rebuild

review: Approve (continuous-integration)
Revision history for this message
Robert Gildein (rgildein) wrote :

LGTM

review: Approve
Revision history for this message
Tianqi Xiao (txiao) wrote :

LGTM

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

Change successfully merged at revision 9361e4c109d1a21b183d7340b8259388dc2da770

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 3d3c2fb..f8312cc 100644
3--- a/charmcraft.yaml
4+++ b/charmcraft.yaml
5@@ -3,7 +3,11 @@ parts:
6 charm:
7 source: src
8 plugin: reactive
9- build-snaps: [charm]
10+ # using charm/3.x/stable will cause the charm unable to install on 18.04
11+ # with the following error: "pip requires Python '>=3.7' but the running
12+ # Python is 3.6.9". This is because charm/3.x/stable start using system
13+ # installation of python instead of a python snap.
14+ build-snaps: [charm/2.x/stable]
15 bases:
16 - build-on:
17 - name: ubuntu
18diff --git a/src/tox.ini b/src/tox.ini
19index 0ab2129..361de8b 100644
20--- a/src/tox.ini
21+++ b/src/tox.ini
22@@ -46,8 +46,10 @@ deps =
23
24 [flake8]
25 ignore =
26- D102 #TODO Missing docstring in public method
27- D103 #TODO Missing docstring in public function
28+ #TODO Missing docstring in public method
29+ D102
30+ #TODO Missing docstring in public function
31+ D103
32 exclude =
33 .git,
34 __pycache__,

Subscribers

People subscribed via source and target branches

to all changes: