From 8e9eb4aaceaed2b835ef3aec5da70878314dae1e Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@openstack.org>
Date: Fri, 27 Dec 2013 09:24:21 -0800
Subject: [PATCH] Combine periodic grizzly and havana pipelines

Having two pipelines will cause twice the number of emails to be
sent.  Since the go to the same email list anyway, combine the
grizzly and havana periodic pipelines.  Keep the templates separate
to continue to support a project having one set of stable jobs but
not another.

Also, set the trigger minute to be different for each of the
periodic pipelines.  Zuul matches trigger events to pipelines based
on time specs, which means if 4 pipelines have timer triggers with
the same values, each pipeline is triggered 4 times (so 16 items
are enqueued across all 4 pipelines instead of 4 items).  This should
obviously be fixed in Zuul, but do this for now.

Add a customized subject to the emails sent by the pipeline.  This is
anticipating a change to Zuul, but is syntax-compatible with the
currently-running Zuul.

Change-Id: I1a8943af435115cb1aaf3c29fb2144e3be9e40bf
---
 .../openstack_project/files/zuul/layout.yaml  | 29 ++++++-------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index e6aef7ca69..e380bf956b 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -112,29 +112,18 @@ pipelines:
       timer:
         - time: '0 6 * * *'
 
-  - name: periodic-grizzly
-    description: Periodic checks of the stable/grizzly branches.
+  - name: periodic-stable
+    description: Periodic checks of the stable branches.
     manager: IndependentPipelineManager
     precedence: low
     trigger:
       timer:
-        - time: '0 6 * * *'
-    failure:
-      smtp:
-        from: jenkins@openstack.org
-        to: openstack-stable-maint@lists.openstack.org
-
-  - name: periodic-havana
-    description: Periodic checks of the stable/havana branches.
-    manager: IndependentPipelineManager
-    precedence: low
-    trigger:
-      timer:
-        - time: '0 6 * * *'
+        - time: '1 6 * * *'
     failure:
       smtp:
         from: jenkins@openstack.org
         to: openstack-stable-maint@lists.openstack.org
+        subject: 'Stable check of {change.project} failed'
 
   - name: periodic-qa
     description: Periodic jobs for the QA team.
@@ -142,11 +131,12 @@ pipelines:
     precedence: low
     trigger:
       timer:
-        - time: '0 6 * * *'
+        - time: '2 6 * * *'
     failure:
       smtp:
         from: jenkins@openstack.org
         to: openstack-qa@lists.openstack.org
+        subject: 'Periodic jobs for {change.project} failed'
 
 
 project-templates:
@@ -176,13 +166,13 @@ project-templates:
       - '{name}-docs'
 
   - name: periodic-grizzly
-    periodic-grizzly:
+    periodic-stable:
       - 'periodic-{name}-docs-grizzly'
       - 'periodic-{name}-python26-grizzly'
       - 'periodic-{name}-python27-grizzly'
 
   - name: periodic-havana
-    periodic-havana:
+    periodic-stable:
       - 'periodic-{name}-docs-havana'
       - 'periodic-{name}-python26-havana'
       - 'periodic-{name}-python27-havana'
@@ -1821,11 +1811,10 @@ projects:
     post:
       - tempest-docs
       - tempest-branch-tarball
-    periodic-grizzly:
+    periodic-stable:
       - periodic-tempest-dsvm-full-grizzly
       - periodic-tempest-dsvm-neutron-grizzly
       - periodic-tempest-dsvm-postgres-full-grizzly
-    periodic-havana:
       - periodic-tempest-dsvm-full-havana
       - periodic-tempest-dsvm-neutron-havana
       - periodic-tempest-dsvm-postgres-full-havana