From ed216efec91907f44c4583c8cd786101155b9a06 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Tue, 16 Nov 2021 15:52:02 +0100
Subject: [PATCH] Add Octavia job for testing OVN provider

This also temporarily removes voting from octavia jobs

Change-Id: Ic09990498807d5f7c5a5169849dc3e68153fe85d
---
 zuul.d/devstack-tobiko-octavia.yaml | 42 ++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/zuul.d/devstack-tobiko-octavia.yaml b/zuul.d/devstack-tobiko-octavia.yaml
index 7096bab..f2c4f21 100644
--- a/zuul.d/devstack-tobiko-octavia.yaml
+++ b/zuul.d/devstack-tobiko-octavia.yaml
@@ -7,12 +7,15 @@
     check:
       jobs:
         - devstack-tobiko-octavia
-    gate:
-      jobs:
-        - devstack-tobiko-octavia
+        - devstack-tobiko-octavia-ovs
+    # gate:
+    #  jobs:
+        # - devstack-tobiko-octavia
+        # - devstack-tobiko-octavia-ovs
     periodic:
       jobs:
         - devstack-tobiko-octavia
+        - devstack-tobiko-octavia-ovs
 
 
 # --- STANDALONE -------------------------------------------------------------
@@ -26,7 +29,7 @@
       - openstack/octavia-lib
       - openstack/python-barbicanclient
       - openstack/tripleo-image-elements
-    voting: true
+    voting: false
     irrelevant-files: &FAULTS_IRRELEVANT_FILES
       - ^.*\.rst$
       - ^doc/
@@ -38,6 +41,25 @@
     vars:
       devstack_plugins:
         octavia: https://opendev.org/openstack/octavia.git
+      devstack_services:
+        # Octavia services
+        octavia: true
+        o-cw: true
+        o-hk: true
+        o-hm: true
+        o-api: true
+      test_workflow: octavia-faults
+      zuul_copy_output:
+        '/var/log/dib-build/': logs
+        '/var/log/octavia-tenant-traffic.log': logs
+        '/var/log/octavia-amphora.log': logs
+
+
+- job:
+    name: devstack-tobiko-octavia-ovs
+    parent: devstack-tobiko-octavia
+    voting: false
+    vars:
       devstack_localrc:
         Q_AGENT: openvswitch
         Q_ML2_TENANT_NETWORK_TYPE: vxlan
@@ -56,15 +78,3 @@
         q-meta: true
         q-metering: true
         q-svc: true
-        neutron-trunk: false
-        # Octavia
-        octavia: true
-        o-cw: true
-        o-hk: true
-        o-hm: true
-        o-api: true
-      test_workflow: octavia-faults
-      zuul_copy_output:
-        '/var/log/dib-build/': logs
-        '/var/log/octavia-tenant-traffic.log': logs
-        '/var/log/octavia-amphora.log': logs