From 1310c536e628ce8a7673415df00cd962897f47a9 Mon Sep 17 00:00:00 2001
From: Lucas Alvares Gomes <lucasagomes@gmail.com>
Date: Tue, 7 Jan 2020 15:51:18 +0000
Subject: [PATCH] [OVN] Enable neutron-ovn-tempest-ovs-release job

The previous patch changed DevStack to deploy the OVN driver from the
Neutron repository instead of the networking-ovn one.

This patch is now enabling tempest testing that code in the check and
gate pipeline.

Change-Id: I772c33789443f08e4b70d37602a73d28fdf2f6fb
Signed-off-by: Lucas Alvares Gomes <lucasagomes@gmail.com>
---
 zuul.d/project.yaml            | 4 ++--
 zuul.d/tempest-singlenode.yaml | 9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 1e6400eb4d7..1a13f04e8b9 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -45,7 +45,7 @@
             irrelevant-files: *irrelevant-files
         - tempest-slow-py3:
             irrelevant-files: *irrelevant-files
-        #- neutron-ovn-tempest-ovs-release
+        - neutron-ovn-tempest-ovs-release
         - networking-midonet-tempest-aio-ml2-centos-7:
             voting: false
             irrelevant-files: *irrelevant-files
@@ -87,7 +87,7 @@
             irrelevant-files: *irrelevant-files
         - tempest-ipv6-only:
             irrelevant-files: *irrelevant-files
-       #- neutron-ovn-tempest-ovs-release
+        - neutron-ovn-tempest-ovs-release
        #- neutron-ovn-rally-task
        #- neutron-ovn-tripleo-ci-centos-7-containers-multinode
 
diff --git a/zuul.d/tempest-singlenode.yaml b/zuul.d/tempest-singlenode.yaml
index 8710e9de5cd..e4ec0f2ff7c 100644
--- a/zuul.d/tempest-singlenode.yaml
+++ b/zuul.d/tempest-singlenode.yaml
@@ -148,7 +148,6 @@
     timeout: 10800
     required-projects:
       - openstack/devstack-gate
-      - openstack/networking-ovn
       - openstack/neutron
       - openstack/neutron-tempest-plugin
       - openstack/octavia
@@ -188,6 +187,10 @@
         (tempest.(api|scenario|thirdparty))).*$"
       tempest_concurrency: 2
       devstack_localrc:
+        Q_AGENT: ovn
+        Q_ML2_PLUGIN_MECHANISM_DRIVERS: ovn,logger
+        Q_ML2_PLUGIN_TYPE_DRIVERS: local,flat,vlan,geneve
+        Q_ML2_TENANT_NETWORK_TYPE: geneve
         Q_USE_PROVIDERNET_FOR_PUBLIC: true
         PHYSICAL_NETWORK: public
         ENABLE_CHASSIS_AS_GW: true
@@ -203,7 +206,7 @@
         ADVANCED_INSTANCE_USER: ubuntu
         BUILD_TIMEOUT: 784
       devstack_plugins:
-        networking-ovn: https://opendev.org/openstack/networking-ovn
+        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:
@@ -228,7 +231,7 @@
         n-novnc-cell1: true
         n-sch: true
         n-super-cond: true
-        networking-ovn-metadata-agent: true
+        neutron-ovn-metadata-agent: true
         o-api: true
         o-hk: true
         ovn-controller: true