Skip to content

Commit 2fb5796

Browse files
authored
Merge pull request #162 from stackhpc/upstream/2023.1-2026-02-19
Synchronise 2023.1 with upstream
2 parents e06fec8 + 7530949 commit 2fb5796

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

.zuul.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@
803803
irrelevant-files: *nova-base-irrelevant-files
804804
- neutron-ovs-tempest-iptables_hybrid:
805805
irrelevant-files: *nova-base-irrelevant-files
806-
- os-vif-ovs:
806+
- os-vif-ovn:
807807
irrelevant-files: *nova-base-irrelevant-files
808808
- devstack-plugin-ceph-compute-local-ephemeral:
809809
irrelevant-files: *nova-base-irrelevant-files

tox.ini

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
[tox]
22
minversion = 3.18.0
33
envlist = py3,functional,pep8
4+
# NOTE(elod.illes): latest virtualenv bundles setuptools 82.0.0, which
5+
# dropped pkg_resources module source from the package, which is used
6+
# in nova and other packages, thus virtualenv needs to be pinned to fix
7+
# the gate.
8+
requires =
9+
virtualenv<20.37.0
410

511
[testenv]
612
usedevelop = True

0 commit comments

Comments
 (0)