Merge ~txiao/charm-prometheus-openstack-exporter:jammy-support into charm-prometheus-openstack-exporter:master

[Tianqi Xiao]

Add jammy support, remove legacy series support, and resolve LP#1925278

This commit:
    1. Added jammy support and functional tests.
    2. Removed xenial, trusty, and yakkety support from the main
    development track due to package dependency issue.
    3. Resolved LP#1925278 bug for zaza tests
    4. Update keystone version to focal and switch mysql instance to mysql-innodb-cluster in focal and jammy functional test.

func-test: https://pastebin.ubuntu.com/p/rZXpPZf9ht/

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

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

[Eric Chen (eric-chen)]

review: Needs Information

[Eric Chen (eric-chen)]

review: Approve

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

Change successfully merged at revision f3d9bf3f6f5ff8def9ad2a732d5e943477f39dd4

[Robert Gildein (rgildein)]

This has already been merged, but how was it tested? Can we add the
results of these tests here?

[Tianqi Xiao (txiao)]

Thanks Robert for your feedback. I've added the func-test result to the MP description.

diff --git a/charmcraft.yaml b/charmcraft.yaml
index 1f750bc..3d3c2fb 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -7,19 +7,19 @@ parts:
 bases:
     - build-on:
         - name: ubuntu
-          channel: "20.04"
+          channel: "22.04"
           architectures: ["amd64"]
       run-on:
         - name: ubuntu
-          channel: "20.04"
+          channel: "22.04"
           architectures:
               - amd64
         - name: ubuntu
-          channel: "18.04"
+          channel: "20.04"
           architectures:
               - amd64
         - name: ubuntu
-          channel: "16.04"
+          channel: "18.04"
           architectures:
               - amd64
 
diff --git a/src/metadata.yaml b/src/metadata.yaml
index f47cb95..97a6694 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -24,11 +24,9 @@ provides:
   dashboards:
     interface: grafana-dashboard
 series:
-  - xenial
   - bionic
-  - trusty
-  - yakkety
   - focal
+  - jammy
 extra-bindings:
   public:
   admin:
diff --git a/src/tests/functional/requirements.txt b/src/tests/functional/requirements.txt
index daa080c..593ef44 100644
--- a/src/tests/functional/requirements.txt
+++ b/src/tests/functional/requirements.txt
@@ -1,2 +1,3 @@
 git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-requests<2.25.0
\ No newline at end of file
+requests<2.25.0
+python-openstackclient
\ No newline at end of file
diff --git a/src/tests/functional/tests/bundles/focal.yaml b/src/tests/functional/tests/bundles/focal.yaml
index 2b05215..65a51c1 100644
--- a/src/tests/functional/tests/bundles/focal.yaml
+++ b/src/tests/functional/tests/bundles/focal.yaml
@@ -11,12 +11,10 @@ applications:
     num_units: 1
   keystone:
     charm: ch:keystone
-    series: bionic
     num_units: 1
   mysql:
-    charm: ch:percona-cluster
-    series: bionic
-    num_units: 1
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
   grafana:
     charm: ch:grafana
     num_units: 1
diff --git a/src/tests/functional/tests/bundles/xenial.yaml b/src/tests/functional/tests/bundles/jammy.yaml
similarity index 83%
rename from src/tests/functional/tests/bundles/xenial.yaml
rename to src/tests/functional/tests/bundles/jammy.yaml
index 60c4212..2d788b6 100644
--- a/src/tests/functional/tests/bundles/xenial.yaml
+++ b/src/tests/functional/tests/bundles/jammy.yaml
@@ -1,4 +1,4 @@
-series: xenial
+series: jammy
 applications:
   prometheus-openstack-exporter:
     options:
@@ -6,18 +6,24 @@ applications:
     num_units: 1
   nrpe:
     charm: ch:nrpe
+    channel: latest/edge
+    series: focal # have to use focal here because nrpe has no official jammy
+                  # jammy support. Needs to be removed in the future.
   prometheus:
     charm: ch:prometheus2
     num_units: 1
+    series: focal
   keystone:
     charm: ch:keystone
+    series: focal
     num_units: 1
   mysql:
-    charm: ch:percona-cluster
-    num_units: 1
+    charm: ch:mysql-innodb-cluster
+    num_units: 3
   grafana:
     charm: ch:grafana
     num_units: 1
+    series: focal
 
 relations:
   - - prometheus-openstack-exporter:nrpe-external-master
diff --git a/src/tests/functional/tests/tests.yaml b/src/tests/functional/tests/tests.yaml
index 50310f4..14ea8d6 100644
--- a/src/tests/functional/tests/tests.yaml
+++ b/src/tests/functional/tests/tests.yaml
@@ -1,8 +1,8 @@
 charm_name: prometheus-openstack-exporter
 gate_bundles:
+  - jammy
   - focal
   - bionic
-  - xenial
 smoke_bundles:
   - bionic
 dev_bundles:
diff --git a/src/tox.ini b/src/tox.ini
index f804ddc..0ab2129 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -21,6 +21,16 @@ passenv =
   NO_PROXY
   SNAP_HTTP_PROXY
   SNAP_HTTPS_PROXY
+  OS_REGION_NAME
+  OS_AUTH_VERSION
+  OS_AUTH_URL
+  OS_PROJECT_DOMAIN_NAME
+  OS_USERNAME
+  OS_PASSWORD
+  OS_PROJECT_ID
+  OS_USER_DOMAIN_NAME
+  OS_PROJECT_NAME
+  OS_IDENTITY_API_VERSION
 
 [testenv:lint]
 commands =