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 - pin setuptools < 50.0 Change-Id: Ib45895574d1d3528abbd072f11b15fe7c31d55e0
This commit is contained in:
parent
f7eb87bbdd
commit
a1cd14acd8
|
@ -3,4 +3,4 @@
|
||||||
*__pycache__*
|
*__pycache__*
|
||||||
*.pyc
|
*.pyc
|
||||||
build
|
build
|
||||||
*.charmt
|
*.charm
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- openstack-python3-ussuri-jobs
|
- openstack-python3-charm-yoga-jobs
|
||||||
- openstack-cover-jobs
|
- openstack-cover-jobs
|
||||||
|
|
|
@ -20,7 +20,15 @@ parts:
|
||||||
cp -r $CHARMCRAFT_STAGE/* .
|
cp -r $CHARMCRAFT_STAGE/* .
|
||||||
|
|
||||||
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]
|
||||||
|
|
|
@ -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:
|
||||||
|
|
|
@ -8,9 +8,16 @@
|
||||||
# requirements.txt
|
# requirements.txt
|
||||||
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
|
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
|
# Build requirements
|
||||||
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
|
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
|
simplejson
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@ tags:
|
||||||
- openstack
|
- openstack
|
||||||
series:
|
series:
|
||||||
- focal
|
- focal
|
||||||
- impish
|
- jammy
|
||||||
subordinate: true
|
subordinate: true
|
||||||
requires:
|
requires:
|
||||||
juju-info:
|
juju-info:
|
||||||
|
|
|
@ -9,15 +9,14 @@ pyrsistent<0.18.0
|
||||||
# layer-basic requires setuptools<42, zipp>=2.0.0 requires setuptools>42
|
# layer-basic requires setuptools<42, zipp>=2.0.0 requires setuptools>42
|
||||||
# LP: #1862186
|
# LP: #1862186
|
||||||
zipp < 2.0.0
|
zipp < 2.0.0
|
||||||
# Pin setuptools as tactical fix for LP: 1855766. Can be removed when
|
|
||||||
# https://github.com/juju-solutions/layer-basic/issues/149 is fixed
|
|
||||||
setuptools < 42.0.0
|
|
||||||
# cryptography 3.4 introduces a requirement for rust code in the module. As it has to be compiled
|
# cryptography 3.4 introduces a requirement for rust code in the module. As it has to be compiled
|
||||||
# on the machine during install, this breaks installs. Instead pin to <3.4 until a solution can be
|
# on the machine during install, this breaks installs. Instead pin to <3.4 until a solution can be
|
||||||
# found that doesn't require compiling on the target machine.
|
# found that doesn't require compiling on the target machine.
|
||||||
# LP: #1915171
|
# LP: #1915171
|
||||||
cryptography<3.4
|
cryptography<3.4
|
||||||
|
|
||||||
|
setuptools < 50.0
|
||||||
|
|
||||||
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
|
||||||
|
|
||||||
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
|
||||||
|
|
15
tox.ini
15
tox.ini
|
@ -68,21 +68,11 @@ basepython = python3
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:py35]
|
|
||||||
basepython = python3.5
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
commands = stestr run --slowest {posargs}
|
|
||||||
|
|
||||||
[testenv:py36]
|
[testenv:py36]
|
||||||
basepython = python3.6
|
basepython = python3.6
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:py37]
|
|
||||||
basepython = python3.7
|
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
|
||||||
commands = stestr run --slowest {posargs}
|
|
||||||
|
|
||||||
[testenv:py38]
|
[testenv:py38]
|
||||||
basepython = python3.8
|
basepython = python3.8
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
@ -93,6 +83,11 @@ basepython = python3.9
|
||||||
deps = -r{toxinidir}/test-requirements.txt
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
commands = stestr run --slowest {posargs}
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
|
[testenv:py310]
|
||||||
|
basepython = python3.10
|
||||||
|
deps = -r{toxinidir}/test-requirements.txt
|
||||||
|
commands = stestr run --slowest {posargs}
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
basepython = python3
|
basepython = python3
|
||||||
deps = flake8==3.9.2
|
deps = flake8==3.9.2
|
||||||
|
|
Loading…
Reference in New Issue