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
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 633dc6f..fc161bc 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -17,8 +17,4 @@ bases:
17 - name: ubuntu17 - name: ubuntu
18 channel: "18.04"18 channel: "18.04"
19 architectures:19 architectures:
20 - amd6420 - amd64
21 - name: ubuntu
22 channel: "16.04"
23 architectures:
24 - amd64
25\ No newline at end of file21\ No newline at end of file
diff --git a/src/metadata.yaml b/src/metadata.yaml
index bb9361d..ef18383 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -33,7 +33,6 @@ tags:
33series:33series:
34 - focal34 - focal
35 - bionic35 - bionic
36 - xenial
37subordinate: true36subordinate: true
38requires:37requires:
39 amqp:38 amqp:
diff --git a/src/tests/functional/tests/bundles/xenial-mysql.yaml b/src/tests/functional/tests/bundles/xenial-mysql.yaml
40deleted file mode 10064439deleted file mode 100644
index 8be660b..0000000
--- a/src/tests/functional/tests/bundles/xenial-mysql.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
1series: xenial
2
3applications:
4 percona-cluster:
5 charm: ch:percona-cluster
6 num_units: 1
7 telegraf:
8 num_units: 0
9
10relations:
11 - - percona-cluster:juju-info
12 - telegraf:juju-info
13 - - percona-cluster:db-admin
14 - telegraf:mysql
diff --git a/src/tests/functional/tests/bundles/xenial-postgres.yaml b/src/tests/functional/tests/bundles/xenial-postgres.yaml
15deleted file mode 1006440deleted file mode 100644
index 8c5821f..0000000
--- a/src/tests/functional/tests/bundles/xenial-postgres.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
1series: xenial
2
3applications:
4 postgresql:
5 charm: ch:postgresql
6 num_units: 2
7 telegraf:
8 num_units: 0
9 ubuntu:
10 charm: ch:ubuntu
11 num_units: 1
12
13relations:
14 - - postgresql:juju-info
15 - telegraf:juju-info
16 - - postgresql:db-admin
17 - telegraf:postgresql
18 - - ubuntu:juju-info
19 - telegraf:juju-info
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index 5e94132..294a526 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -7,8 +7,6 @@ gate_bundles:
7 - base: focal-snap7 - base: focal-snap
8 - compute: focal-compute8 - compute: focal-compute
9 - compute: bionic-compute9 - compute: bionic-compute
10 - base: xenial-mysql
11 - base: xenial-postgres
12smoke_bundles:10smoke_bundles:
13 - base: bionic-postgres11 - base: bionic-postgres
14 - base: focal12 - base: focal

Subscribers

People subscribed via source and target branches

to all changes: