From a87f2c85d3a0ab5f8142626bae6d703982eefbb8 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Wed, 21 Oct 2020 15:20:42 +0200
Subject: [PATCH] Add scenario OVN jobs

Change-Id: I43f16b56ad97ca09854be95172b176927d304bb3
---
 Vagrantfile                      |  4 +++
 playbooks/vagrant/ovn/local.conf |  1 +
 zuul.d/jobs.yaml                 | 18 +++++++++++
 zuul.d/ovn.yaml                  | 55 +++++++++++++++++++++++++++++++-
 zuul.d/project.yaml              |  4 +++
 5 files changed, 81 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 06141fe..b83d5a0 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -99,6 +99,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # using a specific IP.
   config.vm.network "private_network", ip: HOST_IP
 
+  # Create a private network, which allows host-only access to the machine
+  # using a specific IP.
+  config.vm.network "private_network"
+
   # Create a public network, which generally matched to bridged network.
   # Bridged networks make the machine appear as another physical device on
   # your network.
diff --git a/playbooks/vagrant/ovn/local.conf b/playbooks/vagrant/ovn/local.conf
index 9d40266..1457f23 100644
--- a/playbooks/vagrant/ovn/local.conf
+++ b/playbooks/vagrant/ovn/local.conf
@@ -23,6 +23,7 @@ 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"
+PUBLIC_INTERFACE=eth2
 
 enable_service ovn-northd
 enable_service ovn-controller
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 31caf2d..ce78531 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -178,6 +178,24 @@
     voting: true
 
 
+- job:
+    name: devstack-tobiko-scenario
+    parent: devstack-tobiko
+    description: |
+      Base Tobiko devstack job to execute functional tests.
+    vars:
+      test_workflow: create-resources
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/
+      - ^infrared_plugin/
+      - ^releasenotes/
+      - ^report/
+      - ^tobiko/tests/faults/
+      - ^tobiko/tests/functional/
+      - ^tobiko/tests/unit/
+
+
 - job:
     name: devstack-tobiko-multinode
     parent: devstack-tobiko
diff --git a/zuul.d/ovn.yaml b/zuul.d/ovn.yaml
index 0ec891f..06d6328 100644
--- a/zuul.d/ovn.yaml
+++ b/zuul.d/ovn.yaml
@@ -6,22 +6,55 @@
     abstract: true
     description: |
       Base Tobiko devstack job to be used with OVN.
-    vars:
+    vars: &ovn_config
+      devstack_local_conf:
+        post-config:
+          "/$NEUTRON_CORE_PLUGIN_CONF":
+            ovn:
+              enable_distributed_floating_ip: true
       devstack_localrc:
+        ENABLE_CHASSIS_AS_GW: true
+        ENABLE_TLS: true
+        ML2_L3_PLUGIN: ovn-router,trunk
         OVN_BUILD_MODULES: false
+        OVN_DBS_LOG_LEVEL: dbg
+        OVN_IGMP_SNOOPING_ENABLE: true
+        OVN_L3_CREATE_PUBLIC_NETWORK: true
+        PHYSICAL_NETWORK: public
         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
+
       devstack_services:
+        br-ex-tcpdump: true
+        br-int-flows: true
+        c-bak: false
+        dstat: false
+        etcd: false
+        neutron-segments: true
         ovn-controller: true
         ovn-northd: true
+        ovs-vswitchd: true
+        ovsdb-server: true
+        placement-api: true
         q-agt: false
         q-dhcp: false
+        q-dns: true
         q-l3: false
         q-meta: false
+        q-metering: false
         q-ovn-metadata-agent: true
+        q-port-forwarding: true
+        q-qos: true
         q-svc: true
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+        tls-proxy: true
+
 
 - job:
     name: devstack-tobiko-functional-ovn-centos
@@ -34,3 +67,23 @@
     parent: devstack-tobiko-functional-ovn
     nodeset: openstack-single-node-focal
     voting: false
+
+
+- job:
+    name: devstack-tobiko-scenario-ovn
+    parent: devstack-tobiko-scenario
+    abstract: true
+    vars:
+      <<: *ovn_config
+
+- job:
+    name: devstack-tobiko-scenario-ovn-centos
+    parent: devstack-tobiko-scenario-ovn
+    nodeset: devstack-single-node-centos-8
+    voting: false
+
+- job:
+    name: devstack-tobiko-scenario-ovn-ubuntu
+    parent: devstack-tobiko-scenario-ovn
+    nodeset: openstack-single-node-focal
+    voting: false
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 4825fcd..c5d25ae 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -11,6 +11,8 @@
         - devstack-tobiko-functional-ovn-ubuntu
         # - devstack-tobiko-faults-centos
         - devstack-tobiko-faults-ubuntu
+        # - devstack-tobiko-scenario-ovn-centos
+        - devstack-tobiko-scenario-ovn-ubuntu
 
     gate:
       jobs:
@@ -25,3 +27,5 @@
         - devstack-tobiko-functional-ovn-ubuntu
         - devstack-tobiko-faults-centos
         - devstack-tobiko-faults-ubuntu
+        - devstack-tobiko-scenario-ovn-centos
+        - devstack-tobiko-scenario-ovn-ubuntu