From 78ba9a4b6fc8cf54db0c9df3b8510a0586122289 Mon Sep 17 00:00:00 2001
From: Pete Birley <pete@port.direct>
Date: Thu, 13 Sep 2018 06:36:57 -0500
Subject: [PATCH] Simplify zuul.yaml

This relies on inheritence to reduce the parameters of the jobs
and make sure things are easier to read.

Change-Id: If95e82202551612dc4ff9f1411c32e34399f51dd
Signed-off-by: Pete Birley <pete@port.direct>
---
 .zuul.yaml | 73 +++++++++++++++---------------------------------------
 1 file changed, 20 insertions(+), 53 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 44d85a67a..290a0a7ae 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -18,73 +18,29 @@
     check:
       jobs:
         - openstack-helm-infra-linter
-        - openstack-helm-infra-ubuntu:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-infra-centos:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - openstack-helm-infra-ubuntu
+        - openstack-helm-infra-centos
         - openstack-helm-infra-dev-deploy-ceph:
             # NOTE(srwilkers): Changing the dev-deploy-ceph job to nonvoting
             # until we can agree on the proper services to deploy with this job
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
         - openstack-helm-infra-dev-deploy-nfs:
             #NOTE(srwilkers): Changing the dev-deploy-nfs job to nonvoting until
             # we can agree on the proper services to deploy with this job
             voting: false
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-infra-openstack-support:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-infra-kubernetes-keystone-auth:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - openstack-helm-infra-openstack-support
+        - openstack-helm-infra-kubernetes-keystone-auth
     gate:
       jobs:
         - openstack-helm-infra-linter
-        - openstack-helm-infra-ubuntu:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-infra-centos:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-infra-openstack-support:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
-        - openstack-helm-infra-kubernetes-keystone-auth:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - openstack-helm-infra-ubuntu
+        - openstack-helm-infra-centos
+        - openstack-helm-infra-openstack-support
+        - openstack-helm-infra-kubernetes-keystone-auth
     experimental:
       jobs:
         #NOTE(srwilkers): Make fedora job experimental until issues resolved
-        - openstack-helm-infra-fedora:
-            irrelevant-files:
-              - ^.*\.rst$
-              - ^doc/.*$
-              - ^releasenotes/.*$
+        - openstack-helm-infra-fedora
 
 - nodeset:
     name: openstack-helm-single-node
@@ -223,6 +179,13 @@
           - node-3
           - node-4
 
+- job:
+    name: openstack-helm-infra-functional
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^doc/.*$
+      - ^releasenotes/.*$
+
 - job:
     name: openstack-helm-infra-linter
     run: playbooks/zuul-linter.yaml
@@ -230,6 +193,7 @@
 
 - job:
     name: openstack-helm-infra
+    parent: openstack-helm-functional
     timeout: 7200
     pre-run:
       - playbooks/osh-infra-upgrade-host.yaml
@@ -256,6 +220,7 @@
 
 - job:
     name: openstack-helm-infra-dev-deploy-ceph
+    parent: openstack-helm-functional
     timeout: 7200
     pre-run: playbooks/osh-infra-upgrade-host.yaml
     run: playbooks/osh-infra-dev-deploy-ceph.yaml
@@ -264,6 +229,7 @@
 
 - job:
     name: openstack-helm-infra-dev-deploy-nfs
+    parent: openstack-helm-functional
     timeout: 7200
     pre-run: playbooks/osh-infra-upgrade-host.yaml
     run: playbooks/osh-infra-dev-deploy-nfs.yaml
@@ -272,6 +238,7 @@
 
 - job:
     name: openstack-helm-infra-openstack-support
+    parent: openstack-helm-functional
     timeout: 7200
     pre-run: playbooks/osh-infra-upgrade-host.yaml
     run: playbooks/osh-infra-openstack-support.yaml