From ba56ad1098b5c5eb46e4b47ca6b09d72b22a1fc9 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex.kavanagh@canonical.com>
Date: Fri, 25 Mar 2022 16:15:35 +0000
Subject: [PATCH] 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: I3b35d399a2aa2656ba1aa45c54a398923582ef30
---
 .zuul.yaml       |  2 +-
 charmcraft.yaml  | 16 ++++++++++++----
 config.yaml      |  2 +-
 metadata.yaml    |  2 +-
 osci.yaml        |  5 +++--
 requirements.txt | 10 ++++++++++
 tox.ini          | 17 ++++++++---------
 7 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 0eed1965..7ffc71cb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-charm-yoga-jobs
       - openstack-cover-jobs
diff --git a/charmcraft.yaml b/charmcraft.yaml
index 11d5f7cd..eb74c308 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -22,7 +22,15 @@ parts:
       - README.md
 
 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]
diff --git a/config.yaml b/config.yaml
index 83b3f566..8d5c1bbd 100644
--- a/config.yaml
+++ b/config.yaml
@@ -14,7 +14,7 @@ options:
       Setting this to True will allow supporting services to log to syslog.
   openstack-origin:
     type: string
-    default: distro
+    default: yoga
     description: |
       Repository from which to install. May be one of the following:
       distro (default), ppa:somecustom/ppa, a deb url sources entry,
diff --git a/metadata.yaml b/metadata.yaml
index 893dd385..4ca2b415 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -12,7 +12,7 @@ tags:
 - misc
 series:
 - focal
-- impish
+- jammy
 extra-bindings:
   public:
   admin:
diff --git a/osci.yaml b/osci.yaml
index 7eac3f10..d51d5ade 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -1,7 +1,7 @@
 - project:
     templates:
       - charm-unit-jobs-py38
-      - charm-unit-jobs-py39
+      - charm-unit-jobs-py310
     check:
       jobs:
       - ceph-focal-xena
@@ -23,7 +23,8 @@
       - charm-build
       - osci-lint
       - tox-py38
-      - tox-py39
+      - name: tox-py310
+        soft: true
     vars:
       tox_extra_args: ceph:focal-xena
 - job:
diff --git a/requirements.txt b/requirements.txt
index ead6e89a..196ff38f 100644
--- a/requirements.txt
+++ b/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
 
diff --git a/tox.ini b/tox.ini
index 81fd2492..c41077de 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,8 +51,8 @@ commands =
     charmcraft -v build
     {toxinidir}/rename.sh
 
-[testenv:py35]
-basepython = python3.5
+[testenv:py3]
+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
-
-[testenv:py37]
-basepython = python3.7
-deps = -r{toxinidir}/requirements.txt
-       -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [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]
-basepython = python3
+[testenv:py310]
+basepython = python3.10
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
 
 [testenv:pep8]
 basepython = python3