commit 9e3969b0dfcff0fda234d28721d68c15fca6969c
author yatin <ykarel@redhat.com> Mon Aug 28 05:35:27 2023 +0000
committer yatin <ykarel@redhat.com> Mon Aug 28 05:36:19 2023 +0000
tree a87a1f8c1a8222ebd63e3dea52830f5999502324
parent d84b96d294439c6ad70794da94c5f69c8853e9b1

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

This reverts commit d84b96d294439c6ad70794da94c5f69c8853e9b1.

Reason for revert: OVS jobs with GLOBAL_VENV=True are being fixed
with [1]. dynamic-routing jobs already fixed with os-ken latest release[2].

[1] https://review.opendev.org/c/openstack/devstack/+/892848
[2] https://review.opendev.org/c/openstack/releases/+/892214

Depends-On: https://review.opendev.org/c/openstack/devstack/+/892848
Related-bug: #2031415
Related-bug: #2031526
Change-Id: Ifae116a443ba500deb4cf01fdc92c87eb83d7582

zuul.d/master_jobs.yaml

diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 523a931..11bdd9d 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