From 56206e0b1e418a6089142a370ff8fcb5a937337c Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Wed, 28 Oct 2020 09:53:47 +0100
Subject: [PATCH] Add multinode faults OVN jobs

Increments timeout for multinode jobs to 3 hours

Change-Id: Ib1b9e9c730b612ccb0315d68041f7fa8786ec629
---
 zuul.d/jobs.yaml    |  1 +
 zuul.d/ovn.yaml     | 93 +++++++++++++++++++++++++++++++++++++++++++--
 zuul.d/project.yaml |  6 ++-
 3 files changed, 94 insertions(+), 6 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ce78531..d690b32 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -201,6 +201,7 @@
     parent: devstack-tobiko
     abstract: true
     description: Base DevStack Tobiko job with multinode.
+    timeout: 10800
     vars:
       topology: multinode
       devstack_localrc:
diff --git a/zuul.d/ovn.yaml b/zuul.d/ovn.yaml
index 06d6328..9db9eb7 100644
--- a/zuul.d/ovn.yaml
+++ b/zuul.d/ovn.yaml
@@ -1,12 +1,12 @@
 ---
 
 - job:
-    name: devstack-tobiko-functional-ovn
-    parent: devstack-tobiko-functional
+    name: devstack-tobiko-ovn
+    parent: devstack-tobiko
     abstract: true
     description: |
       Base Tobiko devstack job to be used with OVN.
-    vars: &ovn_config
+    vars: &ovn_base
       devstack_local_conf:
         post-config:
           "/$NEUTRON_CORE_PLUGIN_CONF":
@@ -55,6 +55,57 @@
         s-proxy: false
         tls-proxy: true
 
+      devstack_plugins:
+        neutron: "https://opendev.org/openstack/neutron"
+
+- job:
+    name: devstack-tobiko-multinode-ovn
+    parent: devstack-tobiko-multinode
+    abstract: true
+    description: Base DevStack Tobiko job with multinode.
+    vars: &ovn_multinode_vars
+      <<: *ovn_base
+      extensions_to_txt:
+        db: true
+      zuul_copy_output:
+        "{{ devstack_base_dir }}/data/ovn": "logs"
+        "{{ devstack_base_dir }}/data/ovs": "logs"
+        "{{ devstack_log_dir }}/ovsdb-server-nb.log": "logs"
+        "{{ devstack_log_dir }}/ovsdb-server-sb.log": "logs"
+
+    group-vars: &ovn_multinode_group_vars
+      subnode:
+        devstack_services:
+          c-vol: true
+          dstat: true
+          heat: false
+          h-api: false
+          h-api-cfn: false
+          h-eng: false
+          n-api-meta: true
+          placement-client: true
+          n-cpu: true
+          neutron-agent: false
+          # see bug #1860753 (https://bugs.launchpad.net/devstack/+bug/1860753)
+          memory_tracker: false
+          ovn-controller: true
+          q-agt: false
+          q-l3: false
+          q-meta: false
+          q-ovn-metadata-agent: true
+          tls-proxy: false
+
+
+# --- Functional -------------------------------------------------------------
+
+- job:
+    name: devstack-tobiko-functional-ovn
+    parent: devstack-tobiko-functional
+    abstract: true
+    description: |
+      Base Tobiko devstack job to be used with OVN.
+    vars:
+      <<: *ovn_base
 
 - job:
     name: devstack-tobiko-functional-ovn-centos
@@ -69,12 +120,14 @@
     voting: false
 
 
+# --- Scenario ---------------------------------------------------------------
+
 - job:
     name: devstack-tobiko-scenario-ovn
     parent: devstack-tobiko-scenario
     abstract: true
     vars:
-      <<: *ovn_config
+      <<: *ovn_base
 
 - job:
     name: devstack-tobiko-scenario-ovn-centos
@@ -87,3 +140,35 @@
     parent: devstack-tobiko-scenario-ovn
     nodeset: openstack-single-node-focal
     voting: false
+
+
+# --- Faults -----------------------------------------------------------------
+
+- job:
+    name: devstack-tobiko-faults-ovn
+    parent: devstack-tobiko-faults
+    abstract: true
+    vars:
+      <<: *ovn_multinode_vars
+    group-vars:
+      <<: *ovn_multinode_group_vars
+
+
+- job:
+    name: devstack-tobiko-faults-ovn-centos
+    parent: devstack-tobiko-faults-ovn
+    nodeset: devstack-tobiko-multinode-centos
+    voting: false
+
+- job:
+    name: devstack-tobiko-faults-ovn-ubuntu
+    parent: devstack-tobiko-faults-ovn
+    nodeset: devstack-tobiko-multinode-ubuntu
+    voting: false
+    vars:
+      devstack_services:
+        tls-proxy: true
+    group-vars:
+      subnode:
+        devstack_services:
+          tls-proxy: true
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index c5d25ae..7149318 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -11,8 +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
+        # - devstack-tobiko-faults-ovn-centos
+        - devstack-tobiko-faults-ovn-ubuntu
 
     gate:
       jobs:
@@ -27,5 +27,7 @@
         - devstack-tobiko-functional-ovn-ubuntu
         - devstack-tobiko-faults-centos
         - devstack-tobiko-faults-ubuntu
+        - devstack-tobiko-faults-ovn-centos
+        - devstack-tobiko-faults-ovn-ubuntu
         - devstack-tobiko-scenario-ovn-centos
         - devstack-tobiko-scenario-ovn-ubuntu