From 3cde4dc2482ee1ce1496e4066745a0d8f90b7dbf Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Fri, 10 Jun 2022 13:08:51 +0200
Subject: [PATCH] Add job for testing OVS-DVR configuration

Change-Id: I417679351083bdb7f9170b72289f287270bce931
---
 zuul.d/devstack-tobiko-ovs.yaml | 41 +++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/zuul.d/devstack-tobiko-ovs.yaml b/zuul.d/devstack-tobiko-ovs.yaml
index 6f5ae1f..415c9b6 100644
--- a/zuul.d/devstack-tobiko-ovs.yaml
+++ b/zuul.d/devstack-tobiko-ovs.yaml
@@ -7,13 +7,16 @@
     check: &CHECK
       jobs:
         - devstack-tobiko-ovs
-    gate: *CHECK
+        - devstack-tobiko-ovs-dvr
+    gate:
+      jobs:
+        - devstack-tobiko-ovs
     periodic:
       jobs:
         - devstack-tobiko-ovs
+        - devstack-tobiko-ovs-dvr
         - devstack-tobiko-multinode-ovs
 
-
 # --- STANDALONE -------------------------------------------------------------
 
 - job:
@@ -80,6 +83,40 @@
         neutron: "https://opendev.org/openstack/neutron"
 
 
+- job:
+    name: devstack-tobiko-ovs-dvr
+    parent: devstack-tobiko-ovs
+    description: |
+      Base Tobiko devstack job to be used with ML2/OVS and DVR
+    voting: false
+    vars:
+      devstack_local_conf:
+        post_config:
+          $NEUTRON_CONF:
+            DEFAULT:
+              router_distributed: true
+          $NEUTRON_DHCP_CONF:
+            agent:
+              availability_zone: nova
+          $NEUTRON_L3_CONF:
+            DEFAULT:
+              agent_mode: dvr
+            agent:
+              availability_zone: nova
+              debug_iptables_rules: true
+          $NEUTRON_CORE_PLUGIN_CONF:
+            agent:
+              arp_responder: true
+              enable_distributed_routing: true
+              l2_population: true
+              tunnel_types: vxlan
+            ml2:
+              mechanism_drivers: openvswitch,l2population
+            ovs:
+              bridge_mappings: public:br-ex
+              tunnel_bridge: br-tun
+
+
 # --- MULTINODE --------------------------------------------------------------
 
 - job: