diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index f2a17d0cf..81b6cadf0 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -33,7 +33,8 @@ - cross-horizon-py312 - cross-horizon-npm - cross-ironic-py312 - - cross-keystone-py312 + - cross-keystone-py312: + voting: false - cross-kuryr-py312 - cross-manila-py312 - cross-magnum-py312 @@ -49,7 +50,8 @@ - cross-nova-functional - cross-placement-functional-py312 - cross-octavia-py312 - - cross-osc-tox-docs + - cross-osc-tox-docs: + voting: false - cross-swift-py312 - openstacksdk-functional-devstack - tempest-full-py3: diff --git a/build-constraints.txt b/build-constraints.txt new file mode 100644 index 000000000..b722ef629 --- /dev/null +++ b/build-constraints.txt @@ -0,0 +1 @@ +setuptools<82 diff --git a/projects.txt b/projects.txt index 62c68e1fb..789eb73f9 100644 --- a/projects.txt +++ b/projects.txt @@ -70,13 +70,6 @@ openstack/mistral openstack/mistral-dashboard openstack/mistral-lib openstack/mistral-tempest-plugin -openstack/monasca-api -openstack/monasca-common -openstack/monasca-notification -openstack/monasca-persister -openstack/monasca-statsd -openstack/monasca-tempest-plugin -openstack/monasca-ui openstack/networking-bagpipe openstack/networking-baremetal openstack/networking-bgpvpn @@ -189,7 +182,6 @@ openstack/python-magnumclient openstack/python-manilaclient openstack/python-masakariclient openstack/python-mistralclient -openstack/python-monascaclient openstack/python-neutronclient openstack/python-novaclient openstack/python-octaviaclient diff --git a/tools/pip.sh b/tools/pip.sh new file mode 100755 index 000000000..eebd54e3a --- /dev/null +++ b/tools/pip.sh @@ -0,0 +1,3 @@ +#!/bin/bash +pip install 'pip==25.3' +pip install "$@" diff --git a/tox.ini b/tox.ini index 6bdd5145a..e12be80fa 100644 --- a/tox.ini +++ b/tox.ini @@ -11,28 +11,35 @@ deps = -c{toxinidir}/upper-constraints.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} +allowlist_externals = + {toxinidir}/tools/pip.sh [testenv:py39-check-uc] allowlist_externals = check-conflicts + {toxinidir}/tools/pip.sh basepython = python3.9 deps = -r{toxinidir}/upper-constraints.txt -commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt +commands = python -c 'print("done")' +install_command = {toxinidir}/tools/pip.sh --build-constraint={toxinidir}/build-constraints.txt {opts} {packages} [testenv:py310-check-uc] basepython = python3.10 deps = -r{toxinidir}/upper-constraints.txt commands = python -c 'print("done")' +install_command = {toxinidir}/tools/pip.sh --build-constraint={toxinidir}/build-constraints.txt {opts} {packages} [testenv:py311-check-uc] basepython = python3.11 deps = -r{toxinidir}/upper-constraints.txt commands = python -c 'print("done")' +install_command = {toxinidir}/tools/pip.sh --build-constraint={toxinidir}/build-constraints.txt {opts} {packages} [testenv:py312-check-uc] basepython = python3.12 deps = -r{toxinidir}/upper-constraints.txt commands = python -c 'print("done")' +install_command = {toxinidir}/tools/pip.sh --build-constraint={toxinidir}/build-constraints.txt {opts} {packages} [testenv:venv] commands = {posargs}