diff --git a/.zuul.yaml b/.zuul.yaml index 073483b750ff..68c366c944b0 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -655,6 +655,15 @@ image_conversion: output_format: raw +# TODO(gmann): As per the 2023.1 testing runtime, we need to run at least +# one job on Focal. This job can be removed as per the future testing +# runtime (whenever we drop the Ubuntu Focal testing). +- job: + name: tempest-integrated-compute-ubuntu-focal + description: This is integrated compute job testing on Ubuntu Focal(20.04) + parent: tempest-integrated-compute + nodeset: openstack-single-node-focal + - project: # Please try to keep the list of job names sorted alphabetically. templates: @@ -691,10 +700,7 @@ voting: false - nova-tox-functional-py38 - nova-tox-functional-py39 - - nova-tox-functional-py310: - voting: true - - openstack-tox-py310: - voting: true + - nova-tox-functional-py310 - tempest-integrated-compute: # NOTE(gmann): Policies changes do not need to run all the # integration test jobs. Running only tempest and grenade @@ -714,6 +720,8 @@ - ^setup.cfg$ - ^tools/.*$ - ^tox.ini$ + - tempest-integrated-compute-ubuntu-focal: + irrelevant-files: *policies-irrelevant-files - grenade-skip-level: irrelevant-files: *policies-irrelevant-files - nova-grenade-multinode: @@ -747,6 +755,8 @@ - ^(?!nova/network/.*)(?!nova/virt/libvirt/vif.py).*$ - tempest-integrated-compute: irrelevant-files: *policies-irrelevant-files + - tempest-integrated-compute-ubuntu-focal: + irrelevant-files: *policies-irrelevant-files - nova-grenade-multinode: irrelevant-files: *policies-irrelevant-files - tempest-ipv6-only: diff --git a/setup.cfg b/setup.cfg index 58594e229c96..fa6f6af656dd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -22,6 +22,7 @@ classifiers = Programming Language :: Python :: 3 Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 Programming Language :: Python :: 3 :: Only Programming Language :: Python :: Implementation :: CPython diff --git a/tox.ini b/tox.ini index edb08599e7dc..60315b507c3e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 3.18.0 -envlist = py39,functional,pep8 +envlist = py3,functional,pep8 # Automatic envs (pyXX) will only use the python version appropriate to that # env and ignore basepython inherited from [testenv] if we set # ignore_basepython_conflict.