Merge "Fix two-node jobs"

zuul.d/jobs.yaml

@@ -728,30 +728,22 @@
       - ^octavia_tempest_plugin/tests/spare_pool_scenario/.*  # TODO: remove
 
 - job:
-    name: octavia-v2-dsvm-py2-scenario-two-node
+    name: octavia-v2-dsvm-scenario-two-node-traffic-ops
     parent: octavia-v2-dsvm-scenario-two-node
-    host-vars:
+    vars:
-      controller:
+      tempest_test_regex: "\
-        devstack_localrc:
+          ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops.*\
-          USE_PYTHON3: False
+          (test_healthmonitor_|test_.*_ipv6_vip_ipv6_members)"
-          LIBVIRT_TYPE: kvm
-          LIBVIRT_CPU_MODE: host-passthrough
-      controller2:
-        devstack_localrc:
-          USE_PYTHON3: False
-          LIBVIRT_TYPE: kvm
-          LIBVIRT_CPU_MODE: host-passthrough
-    required-projects:
-      - name: openstack/diskimage-builder
-        override-checkout: 2.30.0
 
 - job:
-    name: octavia-v2-act-stdby-dsvm-scenario-two-node
+    name: octavia-v2-act-stdby-dsvm-scenario-two-node-traffic-ops
-    parent: octavia-dsvm-live-two-node-base
+    parent: octavia-v2-dsvm-scenario-two-node
     group-vars:
       controller:
         tempest_concurrency: 2
-        tempest_test_regex: ^octavia_tempest_plugin.tests.scenario.v2
+        tempest_test_regex: "\
+            ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops.*\
+            (test_healthmonitor_|test_.*_ipv6_vip_ipv6_members)"
         tox_envlist: all
         devstack_local_conf:
           post-config:

zuul.d/projects.yaml

@@ -34,7 +34,7 @@
             voting: false
         - octavia-v2-dsvm-scenario-rockylinux-9-non-traffic-ops:
             voting: false
-        - octavia-v2-act-stdby-dsvm-scenario-two-node:
+        - octavia-v2-act-stdby-dsvm-scenario-two-node-traffic-ops:
             voting: false
         - octavia-v2-act-stdby-dsvm-scenario:
             voting: false