Updates for jammy/22.03 enablement

- charmcraft: build-on 20.04 -> run-on 20.04/22.04 [*archs]
- Refresh tox targets
- Drop impish bundles and OSCI testing
- Add jammy metadata
- Set default source config and update bundles to confirm it
  works.

Drop NRPE from Jammy bundles as the charm is not updated to
support Python 3.10 yet.

Func-Test-Pr: https://github.com/openstack-charmers/zaza-openstack-tests/pull/742
Change-Id: If83897aa488a415ab2e3ae85190ef06cbbe17dc9

charmcraft.yaml

@@ -19,7 +19,15 @@ parts:
       cp -r $CHARMCRAFT_STAGE/* .
 
 bases:
-  - name: ubuntu
-    channel: "20.04"
-    architectures:
-      - amd64
+  - build-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures:
+          - amd64
+    run-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [amd64, s390x, ppc64el, arm64]

osci.yaml

@@ -1,7 +1,7 @@
 - project:
     templates:
       - charm-unit-jobs-py38
-      - charm-unit-jobs-py39
+      - charm-unit-jobs-py310
       - charm-xena-functional-jobs
       - charm-yoga-functional-jobs
     vars:

src/config.yaml

@@ -1,6 +1,6 @@
 options:
   source:
-    default: distro
+    default: yoga
     type: string
     description: |
       Repository from which to install OVS+OVN

src/metadata.yaml

@@ -25,7 +25,7 @@ tags:
 - networking
 series:
 - focal
-- impish
+- jammy
 subordinate: false
 provides:
   ovsdb:

src/tests/bundles/focal-yoga.yaml

@@ -47,7 +47,6 @@ applications:
     charm: ../../../ovn-central.charm
     num_units: 3
     options:
-      source: *openstack-origin
     to:
       - '4'
       - '5'

src/tests/bundles/impish-xena.yaml

@@ -1,69 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-local_overlay_enabled: False
-
-series: impish
-
-comment:
-- 'machines section to decide order of deployment. database sooner = faster'
-machines:
-  '0':
-    constraints: mem=3072M
-  '1':
-    constraints: mem=3072M
-  '2':
-    constraints: mem=3072M
-  '3':
-  '4':
-  '5':
-  '6':
-
-applications:
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  vault-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  vault:
-    charm: ch:vault
-    num_units: 1
-    to:
-      - '3'
-    channel: latest/edge
-
-  ovn-central:
-    charm: ../../../ovn-central.charm
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-      - '5'
-      - '6'
-
-  nrpe:
-    charm: cs:nrpe
-
-relations:
-
-  - - 'vault:shared-db'
-    - 'vault-mysql-router:shared-db'
-  - - 'vault-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'ovn-central:certificates'
-    - 'vault:certificates'
-  - - 'nrpe:nrpe-external-master'
-    - 'ovn-central:nrpe-external-master'

src/tests/bundles/jammy-yoga.yaml

@@ -47,15 +47,11 @@ applications:
     charm: ../../../ovn-central.charm
     num_units: 3
     options:
-      source: *openstack-origin
     to:
       - '4'
       - '5'
       - '6'
 
-  nrpe:
-    charm: cs:nrpe
-
 relations:
 
   - - 'vault:shared-db'
@@ -65,5 +61,3 @@ relations:
 
   - - 'ovn-central:certificates'
     - 'vault:certificates'
-  - - 'nrpe:nrpe-external-master'
-    - 'ovn-central:nrpe-external-master'

src/tests/tests.yaml

@@ -2,13 +2,12 @@ charm_name: ovn-central
 
 gate_bundles:
 - focal-xena
-- impish-xena
+- focal-yoga
 
 smoke_bundles:
-- focal-xena
+- focal-yoga
 
 dev_bundles:
-- focal-yoga
 - jammy-yoga
 
 target_deploy_status:
@@ -33,5 +32,4 @@ tests:
 
 tests_options:
   force_deploy:
-    - impish-xena
     - jammy-yoga

tox.ini

@@ -93,6 +93,11 @@ basepython = python3.9
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py310]
+basepython = python3.10
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = flake8==3.9.2