Merge ~txiao/charm-infra-node:jammy-support into charm-infra-node:master

[Tianqi Xiao]

Add jammy support and update fixtures in func tests

- Added jammy support
- Dropped xenial in the main development track due to package dependency issue
- Updated fixtures in fun tests to resolve bug LP#1983398 [1]

[1]: https://bugs.launchpad.net/charm-nagios/+bug/1983398

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

[🤖 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)]

I prefer to do 1 thing in one merge request only.
We should separate these two things into two MR.
- Jammy support
- Update pytest fixture for async functions

I can accept it this time since the MR is too simple.

review: Approve

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

Change successfully merged at revision 94607333e68a9593f585750f4435234e640be133

[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 29d1baa..7e84403 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -7,18 +7,18 @@ parts:
 bases:
     - build-on:
         - name: ubuntu
-          channel: "18.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 9dc2306..6d3f4bc 100644
--- a/src/metadata.yaml
+++ b/src/metadata.yaml
@@ -14,4 +14,4 @@ provides:
 series:
   - bionic
   - focal
-  - xenial
+  - jammy
diff --git a/src/tests/functional/test_deploy.py b/src/tests/functional/test_deploy.py
index d83e09a..10faad9 100644
--- a/src/tests/functional/test_deploy.py
+++ b/src/tests/functional/test_deploy.py
@@ -1,18 +1,19 @@
 import os
 from collections import defaultdict
 import pytest
+import pytest_asyncio
 from juju.model import Model
 
 # Treat tests as coroutines
 pytestmark = pytest.mark.asyncio
 
-series = ['xenial', 'bionic', 'focal']
+series = ['bionic', 'focal', 'jammy']
 nagios_series = defaultdict(lambda: 'bionic')
 nagios_series['xenial'] = "xenial"
 charm_location = os.getenv('CHARM_LOCATION', '.').rstrip('/')
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def model():
     model = Model()
     await model.connect_current()
@@ -20,7 +21,7 @@ async def model():
     await model.disconnect()
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def apps(model):
     apps = []
     for entry in series:
@@ -29,7 +30,7 @@ async def apps(model):
     return apps
 
 
[e-mail]
+@pytest_asyncio.fixture
 async def units(apps):
     units = []
     for app in apps:
@@ -43,10 +44,11 @@ async def test_infranode_deploy(model, series):
     await model.deploy('{}/infra-node.charm'.format(charm_location),
                        series=series,
                        application_name='infra-node-{}'.format(series))
-    await model.deploy('cs:nagios',
+    await model.deploy('ch:nagios',
                        series=nagios_series[series],
                        application_name='nagios-{}'.format(series))
-    await model.deploy('cs:nrpe',
+    await model.deploy('cs:nrpe', # after jammy support made available to nrpe,
+                                  # we need to change the source to charmhub(ch)
                        series=series,
                        application_name='nrpe-{}'.format(series),
                        num_units=0)