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
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 7e84403..7187921 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -18,7 +18,3 @@ bases:
18 channel: "20.04"18 channel: "20.04"
19 architectures:19 architectures:
20 - amd6420 - amd64
21 - name: ubuntu
22 channel: "18.04"
23 architectures:
24 - amd64
diff --git a/src/tests/functional/tests/bundles/bionic.yaml b/src/tests/functional/tests/bundles/bionic.yaml
25deleted file mode 12000021deleted file mode 120000
index f81f6ff..0000000
--- a/src/tests/functional/tests/bundles/bionic.yaml
+++ /dev/null
@@ -1 +0,0 @@
1base.yaml
2\ No newline at end of file0\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
3deleted file mode 1006441deleted file mode 100644
index 65b2826..0000000
--- a/src/tests/functional/tests/bundles/overlays/bionic.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
1series: bionic
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index bbb8e8b..8af72b8 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -2,7 +2,6 @@ charm_name: prometheus-blackbox-exporter
2gate_bundles:2gate_bundles:
3 - jammy3 - jammy
4 - focal4 - focal
5 - bionic
6smoke_bundles:5smoke_bundles:
7 - jammy6 - jammy
8dev_bundles:7dev_bundles:
@@ -12,4 +11,4 @@ tests:
12target_deploy_status:11target_deploy_status:
13 nrpe:12 nrpe:
14 workload-status: blocked13 workload-status: blocked
15 workload-status-message: Nagios server not configured or related14 workload-status-message-prefix: Nagios server not configured or related

Subscribers

People subscribed via source and target branches

to all changes: