From 08fb5a0639c1df87839bbe159be691113796f0e6 Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Thu, 16 Jan 2020 11:57:20 +0100
Subject: [PATCH] Fix jobs not running and add new ones to the gate

Jobs like the barbican and active-standby were not being run in CI
because of the irrelevant-files list set in octavia-tempest-plugin. We
need to override that list in the octavia project.

This patch also adds spare pool and active-standby (replacing the
iptables-based one) jobs to the check and gate queues.

Change-Id: I26cbf5d39dc8857026dda58eb705e6b1fc807544
---
 zuul.d/projects.yaml | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 9bc45d571f..39a7bd5be9 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -18,17 +18,28 @@
               - ^api-ref/.*$
               - ^doc/.*$
               - ^etc/.*$
+              - ^octavia/tests/unit/.*$
               - ^releasenotes/.*$
-        - octavia-v2-dsvm-noop-api
-        - octavia-v2-dsvm-scenario
-        - octavia-v2-dsvm-tls-barbican:
-            irrelevant-files:
+        - octavia-v2-dsvm-noop-api:
+            irrelevant-files: &irrelevant-files
               - ^.*\.rst$
               - ^api-ref/.*$
               - ^doc/.*$
-              - ^octavia/tests/unit/.*$
+              - ^octavia/tests/.*$
               - ^releasenotes/.*$
+        - octavia-v2-dsvm-scenario:
+            irrelevant-files: *irrelevant-files
+        - octavia-v2-dsvm-tls-barbican:
+            irrelevant-files: *irrelevant-files
+        - octavia-v2-dsvm-spare-pool:
+            irrelevant-files: *irrelevant-files
+        - octavia-v2-act-stdby-dsvm-scenario:
+            irrelevant-files: *irrelevant-files
+        - octavia-v2-dsvm-cinder-amphora:
+            irrelevant-files: *irrelevant-files
+            voting: false
         - octavia-v2-dsvm-scenario-two-node:
+            irrelevant-files: *irrelevant-files
             voting: false
         # TODO(haleyb): restore to voting once python3 issues fixed
         - octavia-grenade:
@@ -37,21 +48,14 @@
               - ^.*\.rst$
               - ^api-ref/.*$
               - ^doc/.*$
-              - ^octavia/tests/unit/.*$
+              - ^octavia/tests/.*$
               - ^releasenotes/.*$
               - ^setup.cfg$
               - ^tools/.*$
               - ^(test-|)requirements.txt$
               - ^tox.ini$
         - octavia-v2-dsvm-scenario-amphora-v2:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^api-ref/.*$
-              - ^doc/.*$
-              - ^octavia/tests/unit/.*$
-              - ^releasenotes/.*$
-            voting: false
-        - octavia-v2-act-stdby-iptables-dsvm-scenario:
+            irrelevant-files: *irrelevant-files
             voting: false
     gate:
       fail-fast: true
@@ -63,10 +67,13 @@
               - ^api-ref/.*$
               - ^doc/.*$
               - ^etc/.*$
+              - ^octavia/tests/unit/.*$
               - ^releasenotes/.*$
         - octavia-v2-dsvm-noop-api
         - octavia-v2-dsvm-scenario
         - octavia-v2-dsvm-tls-barbican
+        - octavia-v2-dsvm-spare-pool
+        - octavia-v2-act-stdby-dsvm-scenario
     periodic:
       jobs:
         - publish-openstack-octavia-amphora-image-bionic: