commit 8f63937f01e6e662ced78a758991a0035df468b9
author Zuul <zuul@review.opendev.org> Tue Aug 29 23:32:58 2023 +0000
committer Gerrit Code Review <review@openstack.org> Tue Aug 29 23:32:58 2023 +0000
tree 0580fa286f8636d4e5875b08f251cc5f2e0d6789
parent 010ed337eb52ed33975ecb23e5c6595c88bab3a6
parent 9e3969b0dfcff0fda234d28721d68c15fca6969c

Merge "Revert "Set GLOBAL_VENV=false to fix broken gate jobs""

zuul.d/master_jobs.yaml

diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index c10f321..97b5759 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -45,8 +45,6 @@
         # OVN_BRANCH: "v22.03.3"
         OVN_BRANCH: "36e3ab9b47e93af0599a818e9d6b2930e49473f0"
         OVS_BRANCH: "2410b95597fcec5f733caf77febdb46f4ffacd27"
-        # https://bugs.launchpad.net/neutron/+bug/2031415
-        GLOBAL_VENV: false
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron.git
         neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin.git

zuul.d/project.yaml

diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f8147b1..9ce0212 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -195,14 +195,10 @@
         - neutron-tempest-plugin-bgpvpn-bagpipe-yoga
         - neutron-tempest-plugin-bgpvpn-bagpipe-zed
         - neutron-tempest-plugin-bgpvpn-bagpipe-2023-1
-        - neutron-tempest-plugin-dynamic-routing:
-            voting: false
-        - neutron-tempest-plugin-dynamic-routing-yoga:
-            voting: false
-        - neutron-tempest-plugin-dynamic-routing-zed:
-            voting: false
-        - neutron-tempest-plugin-dynamic-routing-2023-1:
-            voting: false
+        - neutron-tempest-plugin-dynamic-routing
+        - neutron-tempest-plugin-dynamic-routing-yoga
+        - neutron-tempest-plugin-dynamic-routing-zed
+        - neutron-tempest-plugin-dynamic-routing-2023-1
         - neutron-tempest-plugin-fwaas
         - neutron-tempest-plugin-fwaas-zed
         - neutron-tempest-plugin-fwaas-2023-1
@@ -219,6 +215,5 @@
       jobs:
         - neutron-tempest-plugin-sfc
         - neutron-tempest-plugin-bgpvpn-bagpipe
-        - neutron-tempest-plugin-dynamic-routing:
-            voting: false
+        - neutron-tempest-plugin-dynamic-routing
         - neutron-tempest-plugin-fwaas