From 86cab5df28daa948961732c15f7efa335e66b8e7 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Thu, 17 Dec 2020 15:30:52 +0100
Subject: [PATCH] Remove functional and scenario jobs

Change-Id: I2a27588f9e114a0cdb3497e41e595005922ddce2
Depends-On: https://review.opendev.org/c/x/tobiko/+/767560
---
 zuul.d/jobs.yaml    | 54 +--------------------------------------------
 zuul.d/ovn.yaml     | 46 --------------------------------------
 zuul.d/project.yaml | 12 ----------
 3 files changed, 1 insertion(+), 111 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 2f0c86b..a318d3c 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -19,7 +19,7 @@
       - x/tobiko
     roles:
       - zuul: x/tobiko
-    timeout: 7200
+    timeout: 10800
     vars:
       devstack_localrc:
         MULTI_HOST: 0
@@ -128,7 +128,6 @@
       - openstack/octavia-lib
       - openstack/python-barbicanclient
       - openstack/tripleo-image-elements
-    timeout: 7800
     vars:
       devstack_services:
         # Octavia
@@ -172,62 +171,11 @@
       - ^tobiko/tests/faults/
 
 
-- job:
-    name: devstack-tobiko-functional
-    parent: devstack-tobiko
-    description: |
-      Base Tobiko devstack job to execute functional tests.
-    vars:
-      test_workflow: functional
-    irrelevant-files:
-      - ^.*\.rst$
-      - ^doc/
-      - ^infrared_plugin/
-      - ^releasenotes/
-      - ^report/
-      - ^tobiko/tests/faults/
-      - ^tobiko/tests/scenario/
-      - ^tobiko/tests/unit/
-
-
-- job:
-    name: devstack-tobiko-functional-centos
-    parent: devstack-tobiko-functional
-    nodeset: devstack-single-node-centos-8
-    voting: false
-
-
-- job:
-    name: devstack-tobiko-functional-ubuntu
-    parent: devstack-tobiko-functional
-    nodeset: openstack-single-node-focal
-    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
     abstract: true
     description: Base DevStack Tobiko job with multinode.
-    timeout: 10800
     pre-run: playbooks/multinode-setup.yaml
     vars:
       topology: multinode
diff --git a/zuul.d/ovn.yaml b/zuul.d/ovn.yaml
index b1d2a8f..51199ef 100644
--- a/zuul.d/ovn.yaml
+++ b/zuul.d/ovn.yaml
@@ -111,52 +111,6 @@
       <<: *ovn_base
 
 
-# --- 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
-    parent: devstack-tobiko-functional-ovn
-    nodeset: devstack-single-node-centos-8
-    voting: false
-
-- job:
-    name: devstack-tobiko-functional-ovn-ubuntu
-    parent: devstack-tobiko-functional-ovn
-    nodeset: openstack-single-node-focal
-    voting: true
-
-
-# --- Scenario ---------------------------------------------------------------
-
-- job:
-    name: devstack-tobiko-scenario-ovn
-    parent: devstack-tobiko-scenario
-    abstract: true
-    vars:
-      <<: *ovn_base
-
-- 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: true
-
-
 # --- Faults -----------------------------------------------------------------
 
 - job:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 4dbd77f..2521fb5 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,16 +7,10 @@
         - openstack-tox-linters
         - devstack-tobiko-gate
         - devstack-tobiko-gate-ovn
-        - devstack-tobiko-functional-centos
-        - devstack-tobiko-functional-ubuntu
-        - devstack-tobiko-functional-ovn-centos
-        - 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
 
     gate:
       jobs:
@@ -28,13 +22,7 @@
       jobs:
         - devstack-tobiko-gate
         - devstack-tobiko-gate-ovn
-        - devstack-tobiko-functional-centos
-        - devstack-tobiko-functional-ubuntu
-        - devstack-tobiko-functional-ovn-centos
-        - 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