Unblock gate and enable kinetic

The upstream Py310 gate requires addition of bindeps to build
unit test requirements.

Drop impish as it is EOL.

Update tox.ini (except minversion and py310), requirements.txt
and test-requirements.txt from release-tools.

Change-Id: I1ab7636ac0482bf657577fed0368d738a3f8e97e
This commit is contained in:
Frode Nordahl 2022-09-22 08:55:36 +02:00
parent abb21efbae
commit 5d03ce8390
No known key found for this signature in database
GPG Key ID: 6A5D59A3BA48373F
8 changed files with 31 additions and 9 deletions

4
bindep.txt Normal file
View File

@ -0,0 +1,4 @@
libffi-dev [platform:dpkg]
libpq-dev [platform:dpkg]
libxml2-dev [platform:dpkg]
libxslt1-dev [platform:dpkg]

View File

@ -37,3 +37,6 @@ bases:
- name: ubuntu
channel: "22.04"
architectures: [amd64, s390x, ppc64el, arm64]
- name: ubuntu
channel: "22.10"
architectures: [amd64, s390x, ppc64el, arm64]

View File

@ -2,14 +2,13 @@
templates:
- charm-unit-jobs-py36
- charm-unit-jobs-py38
- charm-unit-jobs-py39
- charm-unit-jobs-py310
check:
jobs:
- bionic
- focal
- impish
- jammy
- kinetic
vars:
needs_charm_build: true
charm_build_name: magpie

View File

@ -10,7 +10,9 @@ setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb
# Build requirements
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
charm-tools==2.8.3
charm-tools==2.8.3; python_version < '3.10'
git+https://github.com/juju/charm-tools.git; python_version >= '3.10'
simplejson

View File

@ -14,5 +14,5 @@ peers:
series:
- bionic
- focal
- impish
- jammy
- kinetic

View File

@ -1,6 +1,6 @@
local_overlay_enabled: False
series: impish
series: kinetic
applications:
magpie:
num_units: 3

View File

@ -3,8 +3,8 @@ charm_name: magpie
gate_bundles:
- bionic
- focal
- impish
- jammy
- kinetic
smoke_bundles:
- focal
@ -15,3 +15,7 @@ target_deploy_status:
tests:
- zaza.openstack.charm_tests.magpie.tests.MagpieTest
tests_options:
force_deploy:
- kinetic

16
tox.ini
View File

@ -31,7 +31,7 @@ setenv = VIRTUAL_ENV={envdir}
LAYER_PATH={toxinidir}/layers
INTERFACE_PATH={toxinidir}/interfaces
JUJU_REPOSITORY={toxinidir}/build
passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
passenv = no_proxy http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
install_command =
{toxinidir}/pip.sh install {opts} {packages}
allowlist_externals =
@ -47,7 +47,7 @@ basepython = python3
deps = -r{toxinidir}/build-requirements.txt
commands =
charmcraft clean
charmcraft -v build
charmcraft -v pack
{toxinidir}/rename.sh
[testenv:build-reactive]
@ -65,6 +65,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
@ -85,10 +90,15 @@ 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
charm-tools==2.8.3
git+https://github.com/juju/charm-tools.git
commands = flake8 {posargs} src unit_tests
[testenv:func-target]