Re-enable IPv6Test in OVN scenario job

The related bug is fixed in ovn with[1], so issue
should not be see with ovn-20.03.2+ releases. This
patch re-enables the test by removing it from blacklist,
and adding it to ussuri ovn job as that is running with
ovn-20.03.0.

[1] https://github.com/ovn-org/ovn/commit/53285ae

Depends-On: https://review.opendev.org/c/openstack/networking-sfc/+/827410/
Related-Bug: #1881558
Change-Id: I73c3d6caeaf578fb032750c34e1aaa1ac041da9a
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 468128a..6f62748 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -463,15 +463,12 @@
       network_api_extensions: *api_extensions
       network_api_extensions_ovn:
         - vlan-transparent
-      # TODO(haleyb): Remove IPv6Test from blacklist when
-      # https://bugs.launchpad.net/neutron/+bug/1881558 is fixed.
       # TODO(slaweq): Remove test_trunk_subport_lifecycle test from the
       # blacklist when bug https://bugs.launchpad.net/neutron/+bug/1885900 will
       # be fixed
       # TODO(jlibosva): Remove the NetworkWritableMtuTest test from the list
       # once east/west fragmentation is supported in core OVN
       tempest_exclude_regex: "\
-          (?:neutron_tempest_plugin.scenario.test_ipv6.IPv6Test)|\
           (^neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_trunk_subport_lifecycle)|\
           (^neutron_tempest_plugin.scenario.test_mtu.NetworkWritableMtuTest)"
       devstack_localrc:
diff --git a/zuul.d/ussuri_jobs.yaml b/zuul.d/ussuri_jobs.yaml
index a5a9c7d..be9e0f0 100644
--- a/zuul.d/ussuri_jobs.yaml
+++ b/zuul.d/ussuri_jobs.yaml
@@ -213,6 +213,17 @@
     vars:
       branch_override: stable/ussuri
       network_api_extensions: *api_extensions
+      # TODO(haleyb): Remove IPv6Test from blacklist when
+      # https://bugs.launchpad.net/neutron/+bug/1881558 is fixed.
+      # TODO(slaweq): Remove test_trunk_subport_lifecycle test from the
+      # blacklist when bug https://bugs.launchpad.net/neutron/+bug/1885900 will
+      # be fixed
+      # TODO(jlibosva): Remove the NetworkWritableMtuTest test from the list
+      # once east/west fragmentation is supported in core OVN
+      tempest_exclude_regex: "\
+          (?:neutron_tempest_plugin.scenario.test_ipv6.IPv6Test)|\
+          (^neutron_tempest_plugin.scenario.test_trunk.TrunkTest.test_trunk_subport_lifecycle)|\
+          (^neutron_tempest_plugin.scenario.test_mtu.NetworkWritableMtuTest)"
       devstack_localrc:
         NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}"
         # TODO(mjozefcz): Stop compiling OVS modules when meter action in kernel