From c9f9802fdda5565df7e7dc9ea2e4c21706e0b9b3 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 25 Mar 2022 16:35:49 +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 - Remove overlay as no longer needed in charmhub with explicit .charm - Pin setuptools < 50.0 in src/wheelhouse.txt Change-Id: Ie15e3e0530345f488565454e673e40981f606bdd --- .gitignore | 1 + .zuul.yaml | 2 +- charmcraft.yaml | 16 ++++++++++++---- osci.yaml | 2 +- requirements.txt | 9 ++++++++- src/config.yaml | 2 +- src/metadata.yaml | 2 +- .../bundles/overlays/local-charm-overlay.yaml.j2 | 4 ---- src/wheelhouse.txt | 1 + tox.ini | 15 +++++---------- 10 files changed, 31 insertions(+), 23 deletions(-) delete mode 100644 src/tests/bundles/overlays/local-charm-overlay.yaml.j2 diff --git a/.gitignore b/.gitignore index 98c9c5a..b620cbb 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ trusty .testrepository __pycache__ .stestr +*.charm diff --git a/.zuul.yaml b/.zuul.yaml index 0eed196..7ffc71c 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 4968216..c9a0ed7 100644 --- a/charmcraft.yaml +++ b/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] diff --git a/osci.yaml b/osci.yaml index f9834d4..f5ccad6 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 - charm-xena-functional-jobs - charm-yoga-functional-jobs vars: diff --git a/requirements.txt b/requirements.txt index a68620f..7755b95 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,9 +8,16 @@ # requirements.txt setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85 +# 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 + # Build requirements cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35. -charm-tools==2.8.3 +git+https://github.com/juju/charm-tools#egg=charm-tools simplejson diff --git a/src/config.yaml b/src/config.yaml index 1639ef3..9120d9d 100644 --- a/src/config.yaml +++ b/src/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/src/metadata.yaml b/src/metadata.yaml index 9212c82..83ad0d8 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -22,7 +22,7 @@ tags: - openstack series: - focal -- impish +- jammy extra-bindings: public: admin: diff --git a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 deleted file mode 100644 index f239dd8..0000000 --- a/src/tests/bundles/overlays/local-charm-overlay.yaml.j2 +++ /dev/null @@ -1,4 +0,0 @@ - -applications: - nova-cell-controller-cell2: - charm: {{ charm_location }} diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index 1026b85..b0e2cf2 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1,3 +1,4 @@ +setuptools < 50.0 git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack diff --git a/tox.ini b/tox.ini index 2d60b8a..e22fe48 100644 --- a/tox.ini +++ b/tox.ini @@ -68,21 +68,11 @@ basepython = python3 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} -[testenv:py35] -basepython = python3.5 -deps = -r{toxinidir}/test-requirements.txt -commands = stestr run --slowest {posargs} - [testenv:py36] basepython = python3.6 deps = -r{toxinidir}/test-requirements.txt commands = stestr run --slowest {posargs} -[testenv:py37] -basepython = python3.7 -deps = -r{toxinidir}/test-requirements.txt -commands = stestr run --slowest {posargs} - [testenv:py38] basepython = python3.8 deps = -r{toxinidir}/test-requirements.txt @@ -93,6 +83,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