From 11db636c346c2a5ffcdc9a33633844939d116352 Mon Sep 17 00:00:00 2001
From: Brian Rosmaita <rosmaita.fossdev@gmail.com>
Date: Thu, 26 Jul 2018 15:31:18 -0400
Subject: [PATCH] Refactor periodic "tips" jobs

Two changes:
1 - declare the abstract base tips jobs 'abstract'
2 - add a branch matcher to where the periodic tips jobs
    are invoked in the project definition so that they only
    apply to the master branch

Change-Id: I1093de2583da862f58372e6c03b2d9b604dbd630
---
 .zuul.yaml | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 51af6e3f..637e50e1 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -48,6 +48,7 @@
 - job:
     name: glance_store-tox-cinder-tips-base
     parent: tox
+    abstract: true
     description: Abstract job for glance_store vs. cinder
     required-projects:
       - name: openstack/os-brick
@@ -72,6 +73,7 @@
 - job:
     name: glance_store-tox-keystone-tips-base
     parent: tox
+    abstract: true
     description: Abstract job for glance_store vs. keystone
     required-projects:
       - name: openstack/keystoneauth
@@ -96,6 +98,7 @@
 - job:
     name: glance_store-tox-oslo-tips-base
     parent: tox
+    abstract: true
     description: Abstract job for glance_store vs. oslo
     required-projects:
       - name: openstack/oslo.concurrency
@@ -127,6 +130,7 @@
 - job:
     name: glance_store-tox-swift-tips-base
     parent: tox
+    abstract: true
     description: Abstract job for glance_store vs. swift
     required-projects:
       - name: openstack/python-swiftclient
@@ -160,11 +164,19 @@
         - glance_store-dsvm-functional-swift
     periodic:
       jobs:
-        - glance_store-tox-py27-cinder-tips
-        - glance_store-tox-py35-cinder-tips
-        - glance_store-tox-py27-keystone-tips
-        - glance_store-tox-py35-keystone-tips
-        - glance_store-tox-py27-oslo-tips
-        - glance_store-tox-py35-oslo-tips
-        - glance_store-tox-py27-swift-tips
-        - glance_store-tox-py35-swift-tips
+        - glance_store-tox-py27-cinder-tips:
+            branches: master
+        - glance_store-tox-py35-cinder-tips:
+            branches: master
+        - glance_store-tox-py27-keystone-tips:
+            branches: master
+        - glance_store-tox-py35-keystone-tips:
+            branches: master
+        - glance_store-tox-py27-oslo-tips:
+            branches: master
+        - glance_store-tox-py35-oslo-tips:
+            branches: master
+        - glance_store-tox-py27-swift-tips:
+            branches: master
+        - glance_store-tox-py35-swift-tips:
+            branches: master