commit 010ed337eb52ed33975ecb23e5c6595c88bab3a6
author Zuul <zuul@review.opendev.org> Thu Aug 17 20:08:58 2023 +0000
committer Gerrit Code Review <review@openstack.org> Thu Aug 17 20:08:58 2023 +0000
tree 37afdb54a0b705894a64e9c042ad3cad419dd420
parent d84b96d294439c6ad70794da94c5f69c8853e9b1
parent 1f5797e733f691588a87b8a6e9fee073afd73d29

Merge "Update Cirros image to 0.6.2"

neutron_tempest_plugin/scenario/test_security_groups.py

diff --git a/neutron_tempest_plugin/scenario/test_security_groups.py b/neutron_tempest_plugin/scenario/test_security_groups.py
index ed9ff8c..e2d25ee 100644
--- a/neutron_tempest_plugin/scenario/test_security_groups.py
+++ b/neutron_tempest_plugin/scenario/test_security_groups.py
@@ -1137,6 +1137,10 @@
             should_succeed=True)
 
 
+@testtools.skipIf(
+    CONF.neutron_plugin_options.firewall_driver in ['openvswitch', 'None'],
+    "Firewall driver other than 'openvswitch' is required to use "
+    "stateless security groups.")
 class StatelessSecGroupDualStackSlaacTest(BaseNetworkSecGroupTest):
     required_extensions = ['security-group', 'stateful-security-group']
     stateless_sg = True
@@ -1180,6 +1184,10 @@
         self._test_default_sec_grp_scenarios()
 
 
+@testtools.skipIf(
+    CONF.neutron_plugin_options.firewall_driver in ['openvswitch', 'None'],
+    "Firewall driver other than 'openvswitch' is required to use "
+    "stateless security groups.")
 class StatelessSecGroupDualStackDHCPv6StatelessTest(
         StatelessSecGroupDualStackSlaacTest):
     required_extensions = ['security-group', 'stateful-security-group']

zuul.d/master_jobs.yaml

diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 97b5759..c10f321 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -45,6 +45,8 @@
         # 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 9ce0212..f8147b1 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -195,10 +195,14 @@
         - neutron-tempest-plugin-bgpvpn-bagpipe-yoga
         - neutron-tempest-plugin-bgpvpn-bagpipe-zed
         - neutron-tempest-plugin-bgpvpn-bagpipe-2023-1
-        - 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-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-fwaas
         - neutron-tempest-plugin-fwaas-zed
         - neutron-tempest-plugin-fwaas-2023-1
@@ -215,5 +219,6 @@
       jobs:
         - neutron-tempest-plugin-sfc
         - neutron-tempest-plugin-bgpvpn-bagpipe
-        - neutron-tempest-plugin-dynamic-routing
+        - neutron-tempest-plugin-dynamic-routing:
+            voting: false
         - neutron-tempest-plugin-fwaas