Merge "Re-enable IPv4 scenario tests in LVM driver job"

zuul.d/manila-tempest-jobs.yaml

@@ -177,7 +177,6 @@
       - openstack/neutron-dynamic-routing
     vars:
       tempest_test_regex: '(^manila_tempest_tests.tests)(?=.*\[.*\bbackend\b.*\])'
-      tempest_exclude_regex: "(^manila_tempest_tests.tests.scenario.*)"
       devstack_services: &devstack-with-ovs
         # NOTE(gouthamr): LP#1940324 prevents bgp usage with OVN, disable OVN
         br-ex-tcpdump: false
@@ -232,25 +231,21 @@
               multi_backend: true
               image_password: manila
 
-# NOTE(carloss): Nova bumped libvirt to a version available only on Ubuntu
-# Jammy. We are then forced to migrate this job to use Jammy. When LP Bug
-#1998489 is fixed, we will be able to unify the job above with this.
 - job:
     name: manila-tempest-plugin-lvm
     description: |
-      Test LVM multibackend (DHSS=False) in a IPv4 environment.
-    branches:
-      regex: ^stable/(2023.1|zed|yoga|xena|wallaby|victoria|ussuri)$
-      negate: true
+      Test LVM multibackend (DHSS=False) in a 4+6 (dual-stack) devstack
+      environment with IPv6 control plane endpoints.
+    branches: *ubuntu_jammy_test_image_branches
     parent: manila-tempest-plugin-lvm-base
     vars:
+      # TODO(gouthamr): some tests are disabled due to bugs
+      # IPv6 Tests: https://bugs.launchpad.net/manila/+bug/1998489
+      # drop these overrides once we address that bug.
+      tempest_exclude_regex: '(^manila_tempest_tests.tests.scenario.*IPv6.*)'
       devstack_localrc:
         MANILA_SETUP_IPV6: false
-      devstack_local_conf:
-        test-config:
-          $TEMPEST_CONFIG:
-            share:
-              run_ipv6_tests: false
+        NEUTRON_CREATE_INITIAL_NETWORKS: true
 
 - job:
     name: manila-tempest-plugin-container