From 422d33ecc1682f8880b08ec1b302a1be88bfb39e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 5 Jan 2026 21:19:54 +0900 Subject: [PATCH 1/2] Replace removed os-vif-ovs job It was replaced by os-vif-ovn job. Changes: .zuul.yaml NOTE(elod.illes): the change is because patch in version unmaintained/2024.1 included the remove of grenade job from 2023.2, because it went to End of Life, hence the job couldn't run anymore. So this is basically a partial backport from 2024.1, but technically the same patch as on stable/* branches. Depends-on: https://review.opendev.org/c/openstack/os-vif/+/798038 Change-Id: I4fc595eb51c05c4875bc94e0e812f117a35df7cf Signed-off-by: Takashi Kajinami (cherry picked from commit ad911932ff90a25af1abc8fa4a95b07d03f55705) (cherry picked from commit 1783a30680410ebac553e422b0e287f91d101c9e) (cherry picked from commit ccf3e18af9ed0162553b5b6524e90445b162a6db) (cherry picked from commit 95c43bcf7c1ad852bd77e57232acec9f06b9f34f) (cherry picked from commit d7ca3d90ab97547a1ea21fe953b61d7b421592b7) (cherry picked from commit eaa65f0b85123a4ee3432466a15534b4dd19d3eb) --- .zuul.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.zuul.yaml b/.zuul.yaml index e46eac85f5a..141a37f4cf3 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -744,7 +744,7 @@ irrelevant-files: *nova-base-irrelevant-files - neutron-ovs-tempest-iptables_hybrid: irrelevant-files: *nova-base-irrelevant-files - - os-vif-ovs: + - os-vif-ovn: irrelevant-files: *nova-base-irrelevant-files - devstack-plugin-ceph-compute-local-ephemeral: irrelevant-files: *nova-base-irrelevant-files From 876607942f7fa69a40460089b4fc503fcd92ea7f Mon Sep 17 00:00:00 2001 From: Elod Illes Date: Wed, 18 Feb 2026 13:35:27 +0100 Subject: [PATCH 2/2] [CI][stable-only] Workaround for missing pkg_resources With recent virtualenv release (that bundles setuptools in it) tox jobs started to fail with 'missing pkg_resources module' errors. Since this is an old branch, where we have only python version <= 3.11 in gate jobs, it is enough to cap virtualenv to fix the gate. Conflicts: tox.ini Change-Id: If10ce13899edaf6dc1d5798aee17842e54939bc7 Signed-off-by: Elod Illes (cherry picked from commit dd8c0613935834e312834cab7bf451736ed19fb6) (cherry picked from commit 7530949b1bbdabbd459ae1d970bdcf95e3b19ba5) --- tox.ini | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tox.ini b/tox.ini index 0f798c2fde4..1df42f3631f 100644 --- a/tox.ini +++ b/tox.ini @@ -5,6 +5,12 @@ envlist = py39,functional,pep8 # env and ignore basepython inherited from [testenv] if we set # ignore_basepython_conflict. ignore_basepython_conflict = True +# NOTE(elod.illes): latest virtualenv bundles setuptools 82.0.0, which +# dropped pkg_resources module source from the package, which is used +# in nova and other packages, thus virtualenv needs to be pinned to fix +# the gate. +requires = + virtualenv<20.37.0 [testenv] basepython = python3