From 0282dcd44a7dd9f6ebee5f892863d2709c458bf5 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean.dague@samsung.com>
Date: Thu, 6 Mar 2014 13:17:16 -0500
Subject: [PATCH] enable heat-slow in the integrated-gate

this would make heat-slow part of the integrated gate, it should be
a co-gating job because heat pushes on all the rest of the stack in
OpenStack, and tests bringing up non trivial guests (not cirros).

We remove the job from havana because it is not working there, and
better to not hold up enforcing this on icehouse.

Change-Id: Ia03840f7add545c0b11792cc2e7979415af4f15a
---
 modules/openstack_project/files/zuul/layout.yaml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 11df14430f..f6d4047c6b 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -248,10 +248,12 @@ project-templates:
       - 'check-grenade-dsvm'
       - 'check-tempest-dsvm-full'
       - 'check-tempest-dsvm-neutron'
+      - 'check-tempest-dsvm-neutron-heat-slow'
     gate:
       - 'gate-grenade-dsvm'
       - 'gate-tempest-dsvm-full'
       - 'gate-tempest-dsvm-neutron'
+      - 'gate-tempest-dsvm-neutron-heat-slow'
 
   - name: openstack-server-publish-jobs
     post:
@@ -317,8 +319,7 @@ jobs:
     branch: ^(?!stable/grizzly).*$
     voting: false
   - name: ^(gate|check)-tempest-dsvm-neutron-heat-slow
-    branch: ^(?!stable/grizzly).*$
-    voting: false
+    branch: ^(?!stable/(grizzly|havana)).*$
   - name: check-tempest-dsvm-ironic-nv
     voting: false
   - name: check-tempest-dsvm-ironic-postgres-nv
@@ -786,7 +787,6 @@ projects:
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-tempest-dsvm-neutron-heat-slow
     gate:
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-postgres-full
@@ -979,7 +979,6 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - check-tempest-dsvm-cells-full
       - gate-nova-pylint
-      - check-tempest-dsvm-neutron-heat-slow
       - check-grenade-dsvm-partial-ncpu
     gate:
       - gate-devstack-dsvm-cells
@@ -2181,7 +2180,6 @@ projects:
       - check-tempest-dsvm-savanna-full-nv
       - check-tempest-dsvm-savanna-postgres-nv
       - check-tempest-dsvm-savanna-neutron-nv
-      - check-tempest-dsvm-neutron-heat-slow
     gate:
       - gate-tempest-pep8
       - gate-tempest-docs
@@ -2413,7 +2411,6 @@ projects:
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-tempest-dsvm-neutron-heat-slow
       - check-tempest-dsvm-cells-full
       - check-grenade-dsvm-forward
       - check-swift-dsvm-functional