Merge ~mertkirpici/charm-kubernetes-service-checks:bseng/553 into charm-kubernetes-service-checks:master

[Mert Kirpici]

Drop bionic support

During bionic functests, the kubernetes-master charm is erroring due to the issue:
https://bugs.launchpad.net/charm-kubernetes-master/+bug/1991957

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:3e37717151810dbe974fb902d63ac4d1b7564799
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/25/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1363/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1690/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/25//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:a743fd629cfa6bf843fb3b088690950d60cdf59f
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/26/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1364/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1692/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-kubernetes-service-checks-ci/26//rebuild

review: Approve (continuous-integration)

[Erhan Sunar (esunar)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 62cf49a8f52a35801affbbff8c8d37be1a8b2e7d

diff --git a/charmcraft.yaml b/charmcraft.yaml
index 900390b..7a54960 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -18,7 +18,3 @@ bases:
           channel: "20.04"
           architectures:
               - amd64
-        - name: ubuntu
-          channel: "18.04"
-          architectures:
-              - amd64
diff --git a/tests/functional/tests/bundles/bionic.yaml b/tests/functional/tests/bundles/bionic.yaml
deleted file mode 120000
index f81f6ff..0000000
--- a/tests/functional/tests/bundles/bionic.yaml
+++ /dev/null
@@ -1 +0,0 @@
-base.yaml
\ No newline at end of file
diff --git a/tests/functional/tests/bundles/overlays/bionic.yaml.j2 b/tests/functional/tests/bundles/overlays/bionic.yaml.j2
deleted file mode 100644
index 65b2826..0000000
--- a/tests/functional/tests/bundles/overlays/bionic.yaml.j2
+++ /dev/null
@@ -1 +0,0 @@
-series: bionic
diff --git a/tests/functional/tests/tests.yaml b/tests/functional/tests/tests.yaml
index fae8fb8..b6b72ea 100644
--- a/tests/functional/tests/tests.yaml
+++ b/tests/functional/tests/tests.yaml
@@ -30,6 +30,5 @@ target_deploy_status:
 gate_bundles:
     - jammy
     - focal
-    - bionic
 smoke_bundles:
     - focal
diff --git a/tox.ini b/tox.ini
index 4dc1420..8599e68 100644
--- a/tox.ini
+++ b/tox.ini
@@ -41,7 +41,7 @@ commands =
     black --check --exclude "/(\.eggs|\.git|\.tox|\.venv|\.build|dist|charmhelpers|mod)/" .
 deps =
     black
-    flake8
+    flake8<6.0.0 # https://github.com/PyCQA/flake8-import-order/issues/189
     flake8-docstrings
     flake8-import-order
     pep8-naming
@@ -76,5 +76,5 @@ deps = -r{toxinidir}/tests/unit/requirements.txt
 
 [testenv:func]
 changedir = {toxinidir}/tests/functional
-commands = functest-run-suite {posargs}
+commands = functest-run-suite --keep-faulty-model {posargs}
 deps = -r{toxinidir}/tests/functional/requirements.txt