prometheus-grok-exporter-charm

Merge ~xavpaice/charm-prometheus-grok-exporter:add_charmcraft into charm-prometheus-grok-exporter:master

  1. Git
  2. lp:~xavpaice/charm-prometheus-grok-exporter
  3. add_charmcraft
  4. Merge into master
Proposed by Xav Paice
Status: Merged
Approved by: James Troup
Approved revision: c22846ca68dc9fa15e6e2c13ba70dbbf12905c57
Merged at revision: ff219d9128577d72837697276b58ebc3d1a979b8
Proposed branch: ~xavpaice/charm-prometheus-grok-exporter:add_charmcraft
Merge into: charm-prometheus-grok-exporter:master
Diff against target: 38 lines (+15/-1)
3 files modified
charmcraft.yaml (+13/-0)
metadata.yaml (+1/-0)
src/tox.ini (+1/-1)
Reviewer Review Type Date Requested Status
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
BootStack Reviewers Pending
Review via email: mp+415006@code.launchpad.net

Commit message

Add 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 :

PASSED: Continuous integration, rev:c22846ca68dc9fa15e6e2c13ba70dbbf12905c57
https://jenkins.canonical.com/bootstack/job/lp-charm-prometheus-grok-exporter-ci/14/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/254/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/897/

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

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

Change successfully merged at revision ff219d9128577d72837697276b58ebc3d1a979b8

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
2new file mode 100644
3index 0000000..f0ffdaa
4--- /dev/null
5+++ b/charmcraft.yaml
6@@ -0,0 +1,13 @@
7+type: charm
8+parts:
9+ charm:
10+ source: src
11+ plugin: reactive
12+ build-snaps: [charm]
13+bases:
14+ - name: ubuntu
15+ channel: "20.04"
16+ architectures: ["amd64"]
17+ - name: ubuntu
18+ channel: "18.04"
19+ architectures: ["amd64"]
20diff --git a/metadata.yaml b/metadata.yaml
21new file mode 120000
22index 0000000..0768683
23--- /dev/null
24+++ b/metadata.yaml
25@@ -0,0 +1 @@
26+src/metadata.yaml
27\ No newline at end of file
28diff --git a/src/tox.ini b/src/tox.ini
29index 24fb13b..07fca42 100644
30--- a/src/tox.ini
31+++ b/src/tox.ini
32@@ -67,5 +67,5 @@ deps = -r{toxinidir}/tests/unit/requirements.txt
33
34 [testenv:func]
35 changedir = {toxinidir}/tests/functional
36-commands = functest-run-suite {posargs}
37+commands = functest-run-suite --keep-faulty-model {posargs}
38 deps = -r{toxinidir}/tests/functional/requirements.txt

Subscribers

People subscribed via source and target branches

to all changes: