commit 2ee0e6b0da9c293adc2de186582fba22fc5b20fa
author Gregory Thiemonge <gthiemon@redhat.com> Thu Jun 06 15:44:37 2024 +0200
committer Gregory Thiemonge <gthiemon@redhat.com> Thu Nov 13 09:12:48 2025 +0100
tree 3dcd47dbdbe94363b68920e183e3f3da16671717
parent 4a0d1904954fdb16e70a508fc136f62ea76a8786

Fix two-node jobs

- remove legacy py2 job
- add a two-node job with only basic tests from traffic_ops
- act-stdby-two-node is now running only basic tests from traffic_ops

two-node$ jobs are kept for legacy configs, but we should use
two-node-traffic-ops when possible.

Change-Id: If691138a8c66e961c21e4f6a37e7d8f1ced0eb8e
Signed-off-by: Gregory Thiemonge <gthiemon@redhat.com>

zuul.d/jobs.yaml

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ec5c623..02b209f 100644
--- a/zuul.d/jobs.yaml
+++ b/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:
-      controller:
-        devstack_localrc:
-          USE_PYTHON3: False
-          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
+    vars:
+      tempest_test_regex: "\
+          ^octavia_tempest_plugin.tests.scenario.v2.*traffic_ops.*\
+          (test_healthmonitor_|test_.*_ipv6_vip_ipv6_members)"
 
 - job:
-    name: octavia-v2-act-stdby-dsvm-scenario-two-node
-    parent: octavia-dsvm-live-two-node-base
+    name: octavia-v2-act-stdby-dsvm-scenario-two-node-traffic-ops
+    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

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 691c940..2daabdb 100644
--- a/zuul.d/projects.yaml
+++ b/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