Skip to content

Synchronise 2025.1 with upstream #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
priteau merged 4 commits into from
Apr 8, 2026
Merged

Synchronise 2025.1 with upstream #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a242107
Drop Monasca
gouthampacha Dec 8, 2025
277424d
Add build-time constraints on setuptools<82 to check-uc jobs
deshipu Mar 26, 2026
d69d8e8
Merge "Drop Monasca" into stable/2025.1
Apr 1, 2026
dc1a4fe
[stable-2025.1-only] Add pip.sh to py39 allowlist_externals
mnasiadka Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .zuul.d/project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,126 +1,128 @@
- project:
templates:
- openstack-python3-jobs
check:
jobs:
- build-wheel-cache-ubuntu-bionic:
files:
- bindep.txt
- build-wheel-cache-ubuntu-focal:
files:
- bindep.txt
- build-wheel-cache-ubuntu-jammy:
files:
- bindep.txt
- openstack-tox-validate
- requirements-check-self
- requirements-tox-babel
- requirements-tox-bindep:
voting: false
- requirements-tox-py39-check-uc
- requirements-tox-py310-check-uc
- requirements-tox-py311-check-uc
- requirements-tox-py312-check-uc
- requirements-tox-validate-projects:
voting: false
- cross-aodh-py312
- cross-barbican-py312
- cross-ceilometer-py312
- cross-cinder-py312
- cross-designate-py312
- cross-glance-py312
- cross-heat-py312
- 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
- cross-masakari-py312:
voting: false
- cross-mistral-py312:
voting: false
- cross-neutron-py312
- cross-nova-pep8
- cross-nova-py312
- cross-placement-py312
- cross-osvif-py3
- 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:
irrelevant-files:
- ^bindep.txt$
- ^(test-|)requirements.txt$
- ^setup.cfg$
check-arm64:
jobs:
- build-wheel-cache-ubuntu-focal-arm64:
files:
- bindep.txt
- build-wheel-cache-ubuntu-jammy-arm64:
files:
- bindep.txt
gate:
jobs:
- build-wheel-cache-ubuntu-bionic:
files:
- bindep.txt
- build-wheel-cache-ubuntu-focal:
files:
- bindep.txt
- build-wheel-cache-ubuntu-jammy:
files:
- bindep.txt
- openstack-tox-validate
- requirements-check-self
- requirements-tox-babel
- requirements-tox-py39-check-uc
- requirements-tox-py310-check-uc
- requirements-tox-py311-check-uc
- requirements-tox-py312-check-uc
- cross-cinder-py312
- cross-designate-py312
- cross-glance-py312
- cross-heat-py312
- cross-horizon-py312
- cross-horizon-npm
- cross-ironic-py312
- cross-keystone-py312
- cross-kuryr-py312
- cross-manila-py312
- cross-neutron-py312
- cross-nova-pep8
- cross-nova-py312:
files: ^upper-constraints.txt$
- cross-placement-py312:
files: ^upper-constraints.txt$
- cross-osvif-py3
- cross-nova-functional
- cross-placement-functional-py312
- cross-octavia-py312
- cross-osc-tox-docs
- cross-swift-py312
- openstacksdk-functional-devstack
- tempest-full-py3:
irrelevant-files:
- ^bindep.txt$
- ^(test-|)requirements.txt$
- ^setup.cfg$
experimental:
jobs:
- nova-ceph-multistore
- nova-next
- requirements-tox-py39-check-uc-no-wheels
- requirements-tox-py310-check-uc-no-wheels
- requirements-tox-py311-check-uc-no-wheels
- requirements-tox-py312-check-uc-no-wheels
- tempest-integrated-storage
- tempest-pg-full:
irrelevant-files:
- ^(test-|)requirements.txt$
- ^setup.cfg$

Check warning on line 128 in .zuul.d/project.yaml

View check run for this annotation

StackHPC Zuul / stackhpc/check

.zuul.d/project.yaml#L1-L128 

Job nova-ceph-multistore not defined
1 change: 1 addition & 0 deletions build-constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
setuptools<82
8 changes: 0 additions & 8 deletions projects.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions tools/pip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
pip install 'pip==25.3'
pip install "$@"
9 changes: 8 additions & 1 deletion tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
Loading