Skip to content

Commit dc1a4fe

Browse files
committed
[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 <mnasiadka@gmail.com>
1 parent d69d8e8 commit dc1a4fe

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

.zuul.d/project.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@
3333
- cross-horizon-py312
3434
- cross-horizon-npm
3535
- cross-ironic-py312
36-
- cross-keystone-py312
36+
- cross-keystone-py312:
37+
voting: false
3738
- cross-kuryr-py312
3839
- cross-manila-py312
3940
- cross-magnum-py312
@@ -49,7 +50,8 @@
4950
- cross-nova-functional
5051
- cross-placement-functional-py312
5152
- cross-octavia-py312
52-
- cross-osc-tox-docs
53+
- cross-osc-tox-docs:
54+
voting: false
5355
- cross-swift-py312
5456
- openstacksdk-functional-devstack
5557
- tempest-full-py3:

tox.ini

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ allowlist_externals =
1717
[testenv:py39-check-uc]
1818
allowlist_externals =
1919
check-conflicts
20+
{toxinidir}/tools/pip.sh
2021
basepython = python3.9
2122
deps = -r{toxinidir}/upper-constraints.txt
22-
commands = check-conflicts {toxinidir}/upper-constraints.txt {toxinidir}/upper-constraints-xfails.txt
23+
commands = python -c 'print("done")'
2324
install_command = {toxinidir}/tools/pip.sh --build-constraint={toxinidir}/build-constraints.txt {opts} {packages}
2425

2526
[testenv:py310-check-uc]

0 commit comments

Comments
 (0)