Merge ~txiao/charm-telegraf:stable/22.08 into charm-telegraf:stable/22.08

Proposed by Tianqi Xiao
Status: Merged
Approved by: Eric Chen
Approved revision: 7693b14cb359a4d436dad1bacaec5429d69111a7
Merged at revision: 7693b14cb359a4d436dad1bacaec5429d69111a7
Proposed branch: ~txiao/charm-telegraf:stable/22.08
Merge into: charm-telegraf:stable/22.08
Diff against target: 85 lines (+1/-27)
4 files modified
charmcraft.yaml (+1/-5)
dev/null (+0/-19)
src/metadata.yaml (+0/-1)
src/tests/functional/tests/tests.yaml (+0/-2)
Reviewer Review Type Date Requested Status
Eric Chen Approve
Review via email: mp+427692@code.launchpad.net

Commit message

Drop xenial support on the main development track

To post a comment you must log in.
Revision history for this message
Eric Chen (eric-chen) wrote :

+1

review: Approve

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 633dc6f..fc161bc 100644
3--- a/charmcraft.yaml
4+++ b/charmcraft.yaml
5@@ -17,8 +17,4 @@ bases:
6 - name: ubuntu
7 channel: "18.04"
8 architectures:
9- - amd64
10- - name: ubuntu
11- channel: "16.04"
12- architectures:
13- - amd64
14+ - amd64
15\ No newline at end of file
16diff --git a/src/metadata.yaml b/src/metadata.yaml
17index bb9361d..ef18383 100644
18--- a/src/metadata.yaml
19+++ b/src/metadata.yaml
20@@ -33,7 +33,6 @@ tags:
21 series:
22 - focal
23 - bionic
24- - xenial
25 subordinate: true
26 requires:
27 amqp:
28diff --git a/src/tests/functional/tests/bundles/xenial-mysql.yaml b/src/tests/functional/tests/bundles/xenial-mysql.yaml
29deleted file mode 100644
30index 8be660b..0000000
31--- a/src/tests/functional/tests/bundles/xenial-mysql.yaml
32+++ /dev/null
33@@ -1,14 +0,0 @@
34-series: xenial
35-
36-applications:
37- percona-cluster:
38- charm: ch:percona-cluster
39- num_units: 1
40- telegraf:
41- num_units: 0
42-
43-relations:
44- - - percona-cluster:juju-info
45- - telegraf:juju-info
46- - - percona-cluster:db-admin
47- - telegraf:mysql
48diff --git a/src/tests/functional/tests/bundles/xenial-postgres.yaml b/src/tests/functional/tests/bundles/xenial-postgres.yaml
49deleted file mode 100644
50index 8c5821f..0000000
51--- a/src/tests/functional/tests/bundles/xenial-postgres.yaml
52+++ /dev/null
53@@ -1,19 +0,0 @@
54-series: xenial
55-
56-applications:
57- postgresql:
58- charm: ch:postgresql
59- num_units: 2
60- telegraf:
61- num_units: 0
62- ubuntu:
63- charm: ch:ubuntu
64- num_units: 1
65-
66-relations:
67- - - postgresql:juju-info
68- - telegraf:juju-info
69- - - postgresql:db-admin
70- - telegraf:postgresql
71- - - ubuntu:juju-info
72- - telegraf:juju-info
73diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
74index 5e94132..294a526 100644
75--- a/src/tests/functional/tests/tests.yaml
76+++ b/src/tests/functional/tests/tests.yaml
77@@ -7,8 +7,6 @@ gate_bundles:
78 - base: focal-snap
79 - compute: focal-compute
80 - compute: bionic-compute
81- - base: xenial-mysql
82- - base: xenial-postgres
83 smoke_bundles:
84 - base: bionic-postgres
85 - base: focal

Subscribers

People subscribed via source and target branches

to all changes: