From d7446d116a0e33526b28abf7af0e770f6754e8b3 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean.dague@samsung.com>
Date: Thu, 6 Mar 2014 09:13:30 -0500
Subject: [PATCH] create an integrated-gate template

start normalizing the jobs by creating an integrated gate template
to definite common jobs we expect all the integrated projects to
run. Start small with this with just

 - tempest-dsvm-full
 - tempest-dsvm-neutron
 - grenade-dsvm

Which should be a non controversial common set of jobs. After this
merges we can take other jobs one at a time here.

Change-Id: I3d96dcd8f96c3ada9d375b28a564dc43d8a88d74
---
 .../openstack_project/files/zuul/layout.yaml  | 200 ++++--------------
 1 file changed, 44 insertions(+), 156 deletions(-)

diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index fb5a47a76c..11df14430f 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -243,6 +243,16 @@ project-templates:
       - '{name}-branch-tarball'
       - '{name}-coverage'
 
+  - name: integrated-gate
+    check:
+      - 'check-grenade-dsvm'
+      - 'check-tempest-dsvm-full'
+      - 'check-tempest-dsvm-neutron'
+    gate:
+      - 'gate-grenade-dsvm'
+      - 'gate-tempest-dsvm-full'
+      - 'gate-tempest-dsvm-neutron'
+
   - name: openstack-server-publish-jobs
     post:
       - '{name}-docs'
@@ -633,24 +643,19 @@ projects:
       - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-cinder-pylint
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -705,24 +710,19 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
       - gate-gantt-pylint
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -746,23 +746,18 @@ projects:
       - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
+      - name: integrated-gate
     check:
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -784,20 +779,17 @@ projects:
       - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
+      - name: integrated-gate
     check:
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - 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-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     post:
@@ -821,27 +813,22 @@ projects:
       - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-horizon-python27-django14
       - gate-horizon-selenium
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-horizon-python27-django14
       - gate-horizon-selenium
       - check-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     post:
@@ -880,25 +867,20 @@ projects:
       - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-keystone-python33
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
       - check-swift-dsvm-functional
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
       - gate-swift-dsvm-functional
     experimental:
       - gate-grenade-dsvm-forward
@@ -949,19 +931,18 @@ projects:
       - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
+      - name: integrated-gate
     check:
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
-      - check-tempest-dsvm-neutron-pg
       - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-pg
+      - check-tempest-dsvm-neutron-pg
       - gate-tempest-dsvm-neutron-large-ops
       - check-grenade-dsvm-neutron
       - check-devstack-dsvm-neutron
     gate:
       - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-neutron-pg
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-neutron-pg
       - gate-tempest-dsvm-neutron-large-ops
     experimental:
@@ -989,27 +970,22 @@ projects:
       - name: periodic-grizzly
       - name: periodic-havana
       - name: check-requirements
+      - name: integrated-gate
     check:
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
       - check-tempest-dsvm-cells-full
       - gate-nova-pylint
       - check-tempest-dsvm-neutron-heat-slow
       - check-grenade-dsvm-partial-ncpu
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
       - check-tempest-dsvm-neutron-pg
@@ -1107,25 +1083,20 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - check-swift-dsvm-functional
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-swift-dsvm-functional
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -1164,6 +1135,7 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - check-tempest-dsvm-trove-full
     gate:
@@ -1199,13 +1171,12 @@ projects:
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-python-ceilometerclient-python33
       - gate-python-ceilometerclient-pypy
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
@@ -1213,9 +1184,7 @@ projects:
       - gate-python-ceilometerclient-python33
       - gate-python-ceilometerclient-pypy
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     pre-release:
@@ -1232,27 +1201,22 @@ projects:
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-python-cinderclient-python33
       - gate-python-cinderclient-pypy
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-python-cinderclient-python33
       - gate-python-cinderclient-pypy
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -1273,23 +1237,18 @@ projects:
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -1309,24 +1268,19 @@ projects:
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-python-glanceclient-python33
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -1346,6 +1300,7 @@ projects:
   - name: openstack/python-heatclient
     template:
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-python-heatclient-pep8
       - gate-python-heatclient-python26
@@ -1353,9 +1308,7 @@ projects:
       - gate-python-heatclient-python33
       - gate-python-heatclient-pypy
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
@@ -1365,9 +1318,7 @@ projects:
       - gate-python-heatclient-python27
       - gate-python-heatclient-pypy
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     post:
@@ -1418,25 +1369,20 @@ projects:
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-python-keystoneclient-python33
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-python-keystoneclient-python33
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -1483,28 +1429,23 @@ projects:
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-python-neutronclient-python33
       - gate-python-neutronclient-pypy
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - check-tempest-dsvm-neutron-pg
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-python-neutronclient-pypy
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-neutron-pg
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -1525,27 +1466,22 @@ projects:
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-python-novaclient-python33
       - gate-python-novaclient-pypy
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-python-novaclient-python33
       - gate-python-novaclient-pypy
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -1566,11 +1502,9 @@ projects:
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-python-openstackclient-python33
-      - gate-tempest-dsvm-full
-    gate:
-      - gate-tempest-dsvm-full
     pre-release:
       - python-openstackclient-tarball
     release:
@@ -1610,26 +1544,21 @@ projects:
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-python-swiftclient-python33
       - gate-python-swiftclient-pypy
       - check-swift-dsvm-functional
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-python-swiftclient-pypy
       - gate-swift-dsvm-functional
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental-tripleo:
       - check-tripleo-seed-precise
       - check-tripleo-undercloud-precise
@@ -1647,6 +1576,7 @@ projects:
   - name: openstack/python-troveclient
     template:
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-python-troveclient-pep8
       - gate-python-troveclient-python26
@@ -1944,23 +1874,18 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-oslo.config-python33
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-oslo.config-python33
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     pre-release:
       - oslo.config-tarball
     experimental-tripleo:
@@ -1979,21 +1904,16 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental-tripleo:
       - check-tripleo-seed-precise
       - check-tripleo-undercloud-precise
@@ -2011,29 +1931,24 @@ projects:
   - name: openstack/oslo.rootwrap
     template:
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-oslo.rootwrap-pep8
       - gate-oslo.rootwrap-python26
       - gate-oslo.rootwrap-python27
       - gate-oslo.rootwrap-python33
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
     gate:
       - gate-oslo.rootwrap-pep8
       - gate-oslo.rootwrap-python26
       - gate-oslo.rootwrap-python27
       - gate-oslo.rootwrap-python33
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     post:
       - oslo.rootwrap-branch-tarball
     experimental-tripleo:
@@ -2074,21 +1989,16 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-oslo.version-pypy
       - gate-oslo.version-python33
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
-      - check-grenade-dsvm
     gate:
       - gate-oslo.version-pypy
       - gate-oslo.version-python33
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
-      - gate-tempest-dsvm-neutron
-      - gate-grenade-dsvm
     experimental-tripleo:
       - check-tripleo-seed-precise
       - check-tripleo-undercloud-precise
@@ -2118,19 +2028,18 @@ projects:
           - post-mirror-python33
 
   - name: openstack/requirements
+    template:
+      - name: integrated-gate
     check:
       - gate-requirements-pep8
       - gate-requirements-python27
       - gate-requirements-pypy
       - check-requirements-integration-dsvm
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
       - check-swift-dsvm-functional
     gate:
       - gate-requirements-pep8
@@ -2138,12 +2047,9 @@ projects:
       - gate-requirements-pypy
       - gate-requirements-integration-dsvm
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
       - gate-swift-dsvm-functional
     post:
       - post-mirror-python26
@@ -2260,18 +2166,16 @@ projects:
   - name: openstack/tempest
     template:
       - name: check-requirements
+      - name: integrated-gate
     check:
       - gate-tempest-pep8
       - gate-tempest-docs
       - gate-tempest-python27
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - check-tempest-dsvm-cells-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
       - check-tempest-dsvm-ironic-nv
       - check-tempest-dsvm-ironic-postgres-nv
       - check-tempest-dsvm-savanna-full-nv
@@ -2282,12 +2186,9 @@ projects:
       - gate-tempest-pep8
       - gate-tempest-docs
       - gate-tempest-python27
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
     experimental:
       - gate-grenade-dsvm-forward
       - gate-tempest-dsvm-trove-full
@@ -2503,18 +2404,17 @@ projects:
       - gate-noop
 
   - name: openstack-dev/devstack
+    template:
+      - name: integrated-gate
     check:
       - gate-devstack-bash8
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - 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
       - check-grenade-dsvm-forward
       - check-swift-dsvm-functional
       - check-devstack-dsvm-neutron
@@ -2526,12 +2426,9 @@ projects:
     gate:
       - gate-devstack-bash8
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
       - gate-grenade-dsvm-forward
       - gate-swift-dsvm-functional
     experimental:
@@ -2610,30 +2507,25 @@ projects:
   - name: openstack-dev/pbr
     template:
       - name: python-jobs
+      - name: integrated-gate
     check:
       - gate-pbr-python33
       - gate-pbr-pypy
       - check-requirements-integration-dsvm
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
       - check-swift-dsvm-functional
     gate:
       - gate-pbr-python33
       - gate-pbr-pypy
       - gate-requirements-integration-dsvm
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
       - gate-swift-dsvm-functional
     experimental-tripleo:
       - check-tripleo-seed-precise
@@ -2708,19 +2600,18 @@ projects:
       - ci-docs
 
   - name: openstack-infra/devstack-gate
+    template:
+      - name: integrated-gate
     check:
       - gate-devstack-gate-unittests
       - check-devstack-dsvm-cells
       - check-dg-tempest-dsvm-full
       - check-dg-tempest-dsvm-full-reexec
       - check-dg-hooks-dsvm
-      - check-tempest-dsvm-full
       - check-tempest-dsvm-postgres-full
-      - check-tempest-dsvm-neutron
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - check-grenade-dsvm
       - check-swift-dsvm-functional
       - check-tempest-dsvm-full-grizzly
       - check-tempest-dsvm-neutron-grizzly
@@ -2739,12 +2630,9 @@ projects:
     gate:
       - gate-devstack-gate-unittests
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-full
       - gate-tempest-dsvm-postgres-full
-      - gate-tempest-dsvm-neutron
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
-      - gate-grenade-dsvm
       - gate-swift-dsvm-functional
     experimental:
       - gate-grenade-dsvm-forward