From 90955cf893e0c7ff73dfe36989c06d31d6a96d0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20J=C3=B3zefczyk?= <mjozefcz@redhat.com>
Date: Mon, 15 Jun 2020 13:19:04 +0200
Subject: [PATCH] Stop installing Octavia in OVN jobs

We have separate project now - OVN Octavia provider - and its gate
is responsible for testing OVN integration with Octavia.

Change-Id: I317b7ad54a2f5c5c99bf0bff9eba4d91a1a86491
(cherry picked from commit b64d9349641a16c71c1781e137623d5912b1f984)
---
 zuul.d/tempest-multinode.yaml  | 6 ------
 zuul.d/tempest-singlenode.yaml | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/zuul.d/tempest-multinode.yaml b/zuul.d/tempest-multinode.yaml
index d43ca416d5e..5aaa4ef49cc 100644
--- a/zuul.d/tempest-multinode.yaml
+++ b/zuul.d/tempest-multinode.yaml
@@ -92,7 +92,6 @@
       - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-tempest-plugin
-      - openstack/octavia
       - openstack/tempest
     irrelevant-files: *irrelevant-files
     roles:
@@ -125,7 +124,6 @@
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron
         neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin
-        octavia: https://opendev.org/openstack/octavia
       zuul_copy_output:
         '{{ devstack_base_dir }}/data/ovs': 'logs'
       extensions_to_txt:
@@ -136,11 +134,8 @@
         br-ex-tcpdump: true
         br-int-flows: true
         q-ovn-metadata-agent: true
-        o-api: true
-        o-hk: true
         ovn-controller: true
         ovn-northd: true
-        ovn-octavia: true
         ovs-vswitchd: true
         ovsdb-server: true
         placement-api: true
@@ -164,7 +159,6 @@
         devstack_services:
           ovn-controller: true
           ovn-northd: false
-          ovn-octavia: false
           ovs-vswitchd: true
           ovsdb-server: true
           # NOTE(slaweq): it's just to check if this will force devstack to
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index a76025eafd1..4719141a6d8 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -153,7 +153,6 @@
       - openstack/devstack-gate
       - openstack/neutron
       - openstack/neutron-tempest-plugin
-      - openstack/octavia
       - openstack/tempest
     irrelevant-files: *irrelevant-files
     vars: &ovn-base-vars
@@ -219,7 +218,6 @@
       devstack_plugins:
         neutron: https://opendev.org/openstack/neutron
         neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin
-        octavia: https://opendev.org/openstack/octavia
       zuul_copy_output:
         '{{ devstack_base_dir }}/data/ovs': 'logs'
       extensions_to_txt:
@@ -243,11 +241,8 @@
         n-sch: true
         n-super-cond: true
         q-ovn-metadata-agent: true
-        o-api: true
-        o-hk: true
         ovn-controller: true
         ovn-northd: true
-        ovn-octavia: true
         ovs-vswitchd: true
         ovsdb-server: true
         placement-api: true