Updates to enable jammy and finalise charmcraft builds

- Add 22.04 to charmcraft.yaml
- Update metadata to include jammy
- Remove impish from metadata
- Update osci.yaml to include py3.10 default job
- Modify tox.ini to remove py35,py36,py37 tox target and add py310
  target.
- ensure that the openstack-origin is yoga

Change-Id: I520f15d2a9fc2e281796db370d8ed3a88dd67789

.zuul.yaml

@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-charm-yoga-jobs
       - openstack-cover-jobs

charmcraft.yaml

@@ -21,7 +21,15 @@ parts:
       - README.md
 
 bases:
-  - name: ubuntu
+  - build-on:
-    channel: "20.04"
+      - name: ubuntu
-    architectures:
+        channel: "20.04"
-      - amd64
+        architectures:
+          - amd64
+    run-on:
+      - name: ubuntu
+        channel: "20.04"
+        architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "22.04"
+        architectures: [amd64, s390x, ppc64el, arm64]

metadata.yaml

@@ -18,7 +18,7 @@ tags:
 - openstack
 series:
 - focal
-- impish
+- jammy
 extra-bindings:
   data:
 provides:

osci.yaml

@@ -1,7 +1,7 @@
 - project:
     templates:
       - charm-unit-jobs-py38
-      - charm-unit-jobs-py39
+      - charm-unit-jobs-py310
     check:
       jobs:
         # migrate-ovn tests fail on wallaby and above due to:
@@ -25,7 +25,8 @@
       - charm-build
       - osci-lint
       - tox-py38
-      - tox-py39
+      - name: tox-py310
+        soft: true
     vars:
       tox_extra_args: migrate-ovn:focal-xena-dvr-snat
 - job:

requirements.txt

@@ -11,6 +11,16 @@ pbr==5.6.0
 simplejson>=2.2.0
 netifaces>=0.10.4
 
+# Build requirements
+cffi==1.14.6; python_version < '3.6'  # cffi 1.15.0 drops support for py35.
+
+# NOTE: newer versions of cryptography require a Rust compiler to build,
+# see
+# * https://github.com/openstack-charmers/zaza/issues/421
+# * https://mail.python.org/pipermail/cryptography-dev/2021-January/001003.html
+#
+cryptography<3.4
+
 # Strange import error with newer netaddr:
 netaddr>0.7.16,<0.8.0
 

tox.ini

@@ -51,8 +51,8 @@ commands =
     charmcraft -v build
     {toxinidir}/rename.sh
 
-[testenv:py35]
+[testenv:py3]
-basepython = python3.5
+basepython = python3
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
@@ -60,26 +60,25 @@ deps = -r{toxinidir}/requirements.txt
 basepython = python3.6
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-
+commands = stestr run --slowest {posargs}
-[testenv:py37]
-basepython = python3.7
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
 
 [testenv:py38]
 basepython = python3.8
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [testenv:py39]
 basepython = python3.9
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
-[testenv:py3]
+[testenv:py310]
-basepython = python3
+basepython = python3.10
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 basepython = python3