From 1b40a52d1795db18c98a634166ee0cf5dd642b6e Mon Sep 17 00:00:00 2001
From: Artom Lifshitz <alifshit@redhat.com>
Date: Tue, 9 Nov 2021 15:14:57 -0500
Subject: Add nova-ovs-hybrid-plug job

We have a gap in our testing of the exernal events interaction between
Nova and Neutron. The nova-next job tests with the OVS network
backend, and Neutron has jobs that test the OVN network backend, but
nothing tests OVS + the iptables security group firewall driver, aka
"hybrid plug". Add a job to test that.

Conflicts in .zuul.yaml due to efd28166191 which added the
nova-live-migration-ceph job roughly where this patch adds
nova-ovs-hybrid-plug.

Also had to change the nova-base-irrelevant-files reference to
dsvm-irrelevant-files, as the former hasn't been introduced in
wallaby.

Related-bug: 1952003
Change-Id: Ie42eaa2a39ef097b0eb69b8863bb342bae007fff
(cherry picked from commit ded6168ad729e747fc976ca3cdb8baf971fbc31a)
(cherry picked from commit b414fe18f1a9a688a0291e97eb00e3ce3b2f4a52)
---
 .zuul.yaml | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/.zuul.yaml b/.zuul.yaml
index 315332c7a7..56eaccc5d3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -124,6 +124,66 @@
 #       Verifiy the evacuation of instances with ceph ephemeral disks
 #       from down compute hosts.
 
+- job:
+    name: nova-ovs-hybrid-plug
+    parent: tempest-multinode-full-py3
+    description: |
+      Run move operations, reboot, and evacuation (via the same post-run hook
+      as the nova-live-migration job) tests with the OVS network backend and
+      the "iptables_hybrid" securitygroup firewall driver, aka "hybrid plug".
+      The external events interactions between Nova and Neutron in these
+      situations has historically been fragile. This job exercises them.
+    irrelevant-files: *dsvm-irrelevant-files
+    vars:
+      tox_envlist: all
+      tempest_test_regex: (^tempest\..*compute\..*(migration|resize|reboot).*)
+      devstack_localrc:
+        Q_AGENT: openvswitch
+        Q_ML2_TENANT_NETWORK_TYPE: vxlan
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
+        ML2_L3_PLUGIN: router
+      devstack_services:
+        # Disable OVN services
+        br-ex-tcpdump: false
+        br-int-flows: false
+        ovn-controller: false
+        ovn-northd: false
+        q-ovn-metadata-agent: false
+        # Neutron services
+        q-agt: true
+        q-dhcp: true
+        q-l3: true
+        q-meta: true
+      devstack_local_conf:
+        post-config:
+          "/$NEUTRON_CORE_PLUGIN_CONF":
+            securitygroup:
+              firewall_driver: iptables_hybrid
+    group-vars:
+      subnode:
+        devstack_localrc:
+          Q_AGENT: openvswitch
+          Q_ML2_TENANT_NETWORK_TYPE: vxlan
+          Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch,linuxbridge
+          ML2_L3_PLUGIN: router
+        devstack_services:
+          # Disable OVN services
+          br-ex-tcpdump: false
+          br-int-flows: false
+          ovn-controller: false
+          ovn-northd: false
+          ovs-vswitchd: false
+          ovsdb-server: false
+          q-ovn-metadata-agent: false
+          # Neutron services
+          q-agt: true
+        devstack_local_conf:
+          post-config:
+            "/$NEUTRON_CORE_PLUGIN_CONF":
+              securitygroup:
+                firewall_driver: iptables_hybrid
+    post-run: playbooks/nova-live-migration/post-run.yaml
+
 - job:
     name: nova-lvm
     parent: devstack-tempest
@@ -477,6 +537,8 @@
         - nova-lvm
         - nova-multi-cell
         - nova-next
+        - nova-ovs-hybrid-plug:
+            voting: false
         - nova-tox-validate-backport:
             voting: false
         - nova-tox-functional-py38
-- 
cgit v1.2.1