Telegraf Charm

Merge ~canonical-is-bootstack/charm-telegraf/+git/telegraf-charm:aluria/add-focal-testing into charm-telegraf:master

  1. Git
  2. lp:~canonical-is-bootstack/charm-telegraf/+git/telegraf-charm
  3. aluria/add-focal-testing
  4. Merge into master
Proposed by Alvaro Uria
Status: Merged
Merged at revision: c1975085fede612a1bb9db4629ff07c7d1dc67c9
Proposed branch: ~canonical-is-bootstack/charm-telegraf/+git/telegraf-charm:aluria/add-focal-testing
Merge into: charm-telegraf:master
Diff against target: 55 lines (+17/-4)
3 files modified
metadata.yaml (+2/-2)
tests/bundles/focal.yaml (+12/-0)
tests/tests.yaml (+3/-2)
Reviewer Review Type Date Requested Status
Alvaro Uria (community) Approve
Celia Wang Pending
Paul Goins Pending
Review via email: mp+384333@code.launchpad.net

This proposal supersedes a proposal from 2020-05-14.

To post a comment you must log in.
Revision history for this message
Alvaro Uria (aluria) wrote : Posted in a previous version of this proposal

This change should be merged after [1]. Unit and lint were not touched. Func test works fine.

1. https://code.launchpad.net/~canonical-is-bootstack/charm-telegraf/+git/telegraf-charm/+merge/383933

Revision history for this message
Alvaro Uria (aluria) wrote : Posted in a previous version of this proposal

The extra lines "changed" are trailing spaces trimmed by the editor.

Revision history for this message
Celia Wang (ziyiwang) wrote : Posted in a previous version of this proposal

+1

review: Approve
Revision history for this message
Paul Goins (vultaire) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Paul Goins (vultaire) wrote : Posted in a previous version of this proposal

For the next time around, if the target branch is charm-telegraf:master and bug/1878273 is added as a prerequisite, you'll still get the diff of just this change without the prerequisites bloating the diff, but yet still be set to merge into the central master rather than having to work through ~canonical-is-bootstack.

Revision history for this message
Paul Goins (vultaire) wrote : Posted in a previous version of this proposal

This is +1 once https://code.launchpad.net/~canonical-is-bootstack/charm-telegraf/+git/telegraf-charm/+merge/383933 is merged.

Revision history for this message
Alvaro Uria (aluria) wrote :

MP has been rebased and retargeted to the official master branch.

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 bc87cd5..4281206 100644
3--- a/metadata.yaml
4+++ b/metadata.yaml
5@@ -31,10 +31,10 @@ description: >
6 tags:
7 - monitoring
8 series:
9+ - focal
10+ - bionic
11 - xenial
12 - trusty
13- - bionic
14- - focal
15 subordinate: true
16 requires:
17 amqp:
18diff --git a/tests/bundles/focal.yaml b/tests/bundles/focal.yaml
19new file mode 100644
20index 0000000..330b5f2
21--- /dev/null
22+++ b/tests/bundles/focal.yaml
23@@ -0,0 +1,12 @@
24+series: focal
25+
26+applications:
27+ telegraf:
28+ num_units: 0
29+ ubuntu:
30+ charm: cs:ubuntu
31+ num_units: 1
32+
33+relations:
34+ - - ubuntu:juju-info
35+ - telegraf:juju-info
36diff --git a/tests/tests.yaml b/tests/tests.yaml
37index dbe149f..a86cc9d 100644
38--- a/tests/tests.yaml
39+++ b/tests/tests.yaml
40@@ -6,12 +6,13 @@ gate_bundles:
41 - bionic-mysql
42 - bionic-postgres
43 - bionic-monitoring
44+ - focal
45 smoke_bundles:
46- - bionic-mysql
47 - bionic-postgres
48+ - focal
49 dev_bundles:
50- - bionic-mysql
51 - bionic-postgres
52+ - focal
53 target_deploy_status:
54 telegraf:
55 workload-status-message: Monitoring

Subscribers

People subscribed via source and target branches

to all changes: