From a242107c709043dc915afff78a44b80698431320 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Mon, 8 Dec 2025 14:34:24 -0800 Subject: [PATCH 1/3] Drop Monasca This project team and all the deliverables were retired from OpenStack Depends-On: https://review.opendev.org/c/openstack/governance/+/953671 Change-Id: I913c2f6a2331cfdcffd6108a8bfec24b978d8e6a Signed-off-by: Goutham Pacha Ravi (cherry picked from commit 0bcf04932ce2ee8140070664e41dc71586627acb) (cherry picked from commit c8cd9e9c57d27b8a8dd86697922cb40cf74ebcd2) --- projects.txt | 8 -------- 1 file changed, 8 deletions(-) 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 From 277424d1e7d5a9b0b7f2bdb126d4797232686322 Mon Sep 17 00:00:00 2001 From: Radomir Dopieralski Date: Thu, 26 Mar 2026 10:42:03 +0100 Subject: [PATCH 2/3] Add build-time constraints on setuptools<82 to check-uc jobs Many packages in stable branches depend on setuptools<82 at build time, because of the pkg_resources deprecation. We can't fix this by upgrading the packages like we did with the main branch, because we want to keep the branches stable. So we need to pin the setuptools version. However, it's a build-time dependency, so it's a bid more tricky. We have to force a version of pip that supports that option. Change-Id: I5cd04d37068daaccbd91401489918666cb1d61c1 Signed-off-by: Radomir Dopieralski --- build-constraints.txt | 1 + tools/pip.sh | 3 +++ tox.ini | 6 ++++++ 3 files changed, 10 insertions(+) create mode 100644 build-constraints.txt create mode 100755 tools/pip.sh 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/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..7b9a117dc 100644 --- a/tox.ini +++ b/tox.ini @@ -11,6 +11,8 @@ 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 = @@ -18,21 +20,25 @@ allowlist_externals = basepython = python3.9 deps = -r{toxinidir}/upper-constraints.txt commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt +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} From dc1a4fe109658aa0d8b25575526e758bf768adc3 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Thu, 2 Apr 2026 07:23:06 +0200 Subject: [PATCH 3/3] [stable-2025.1-only] Add pip.sh to py39 allowlist_externals Followup after [1] which did not launch all jobs and omitted breakage in py39 job and cross jobs. Also remove check-conflicts usage from py39 that was omitted in [2]. Mark cross-keystone and cross-osc-tox-docs jobs as non voting due to failures related to pkg_resources [1]: I5cd04d37068daaccbd91401489918666cb1d61c1 [2]: Ib97eea1037fac541c8ebadc526ae9c3bb160f685 Change-Id: I807cf2e90d48b725fa5fb1f01b83ec08ff124fa0 Signed-off-by: Michal Nasiadka --- .zuul.d/project.yaml | 6 ++++-- tox.ini | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) 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/tox.ini b/tox.ini index 7b9a117dc..e12be80fa 100644 --- a/tox.ini +++ b/tox.ini @@ -17,9 +17,10 @@ allowlist_externals = [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]