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: I82a3ae55422e0871bddf37debf1089c9a9a3e843
This commit is contained in:
Alex Kavanagh 2022-03-25 16:22:52 +00:00
parent ae178d7471
commit 7508c6104e
7 changed files with 34 additions and 17 deletions

View File

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

View File

@ -23,7 +23,15 @@ parts:
- README.md - README.md
bases: 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]

View File

@ -18,7 +18,7 @@ options:
Setting this to True will allow supporting services to log to syslog. Setting this to True will allow supporting services to log to syslog.
openstack-origin: openstack-origin:
type: string type: string
default: distro default: yoga
description: | description: |
Repository from which to install. May be one of the following: Repository from which to install. May be one of the following:
distro (default), ppa:somecustom/ppa, a deb url sources entry, distro (default), ppa:somecustom/ppa, a deb url sources entry,

View File

@ -11,7 +11,7 @@ tags:
- misc - misc
series: series:
- focal - focal
- impish - jammy
extra-bindings: extra-bindings:
public: public:
admin: admin:

View File

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

View File

@ -11,6 +11,16 @@ pbr==5.6.0
simplejson>=2.2.0 simplejson>=2.2.0
netifaces>=0.10.4 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: # Strange import error with newer netaddr:
netaddr>0.7.16,<0.8.0 netaddr>0.7.16,<0.8.0

17
tox.ini
View File

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