Merge ~mertkirpici/charm-prometheus-blackbox-exporter:bseng/553 into charm-prometheus-blackbox-exporter:master

Proposed by Mert Kirpici
Status: Merged
Approved by: Tianqi Xiao
Approved revision: 135d90495f1feb0dd8c69df3fb357274e42717a3
Merged at revision: 582507661f62e4032980d5e4917ab12c7d056ef8
Proposed branch: ~mertkirpici/charm-prometheus-blackbox-exporter:bseng/553
Merge into: charm-prometheus-blackbox-exporter:master
Diff against target: 45 lines (+1/-7)
3 files modified
charmcraft.yaml (+0/-4)
dev/null (+0/-1)
src/tests/functional/tests/tests.yaml (+1/-2)
Reviewer Review Type Date Requested Status
Tianqi Xiao (community) Approve
Erhan Sunar (community) Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
Review via email: mp+433525@code.launchpad.net

Commit message

Drop bionic support

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 :
review: Approve (continuous-integration)
Revision history for this message
Erhan Sunar (esunar) wrote :

LGTM

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

Change successfully merged at revision 582507661f62e4032980d5e4917ab12c7d056ef8

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 7e84403..7187921 100644
3--- a/charmcraft.yaml
4+++ b/charmcraft.yaml
5@@ -18,7 +18,3 @@ bases:
6 channel: "20.04"
7 architectures:
8 - amd64
9- - name: ubuntu
10- channel: "18.04"
11- architectures:
12- - amd64
13diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml
14deleted file mode 120000
15index f81f6ff..0000000
16--- a/src/tests/functional/tests/bundles/bionic.yaml
17+++ /dev/null
18@@ -1 +0,0 @@
19-base.yaml
20\ No newline at end of file
21diff --git a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
22deleted file mode 100644
23index 65b2826..0000000
24--- a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
25+++ /dev/null
26@@ -1 +0,0 @@
27-series: bionic
28diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
29index bbb8e8b..8af72b8 100644
30--- a/src/tests/functional/tests/tests.yaml
31+++ b/src/tests/functional/tests/tests.yaml
32@@ -2,7 +2,6 @@ charm_name: prometheus-blackbox-exporter
33 gate_bundles:
34 - jammy
35 - focal
36- - bionic
37 smoke_bundles:
38 - jammy
39 dev_bundles:
40@@ -12,4 +11,4 @@ tests:
41 target_deploy_status:
42 nrpe:
43 workload-status: blocked
44- workload-status-message: Nagios server not configured or related
45+ workload-status-message-prefix: Nagios server not configured or related

Subscribers

People subscribed via source and target branches

to all changes: