From 94b80e00e334917f2b2dd1a7223ce2fd580ec726 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 18 Jul 2013 16:59:04 -0700
Subject: [PATCH] Split gate-noop and gate-grenade gate queues.

* .../zuul/layout.yaml: Grenade was running
gate-noop and the grenade tests which put all projects using the
gate-noop jobs in the gate queue with the core OpenStack projects.
Add a gate-grenade-noop and use that with Grenade to split the two
pipelines.

* .../jenkins_job_builder/config/misc.yaml: Add gate-grenade-noop.

Change-Id: I3cdc164b33c569ad70ec1105f915e25a2369ae8b
---
 .../files/jenkins_job_builder/config/misc.yaml            | 4 ++++
 modules/openstack_project/files/zuul/layout.yaml          | 8 ++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
index 8608abf10f..2621075235 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/misc.yaml
@@ -6,6 +6,10 @@
     name: gate-django_openstack_auth-noop
     node: precise
 
+- job:
+    name: gate-grenade-noop
+    node: precise
+
 - job-template:
     name: 'gate-{name}-run-tests'
 
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 21ede59cbf..7f910d95c8 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -95,6 +95,10 @@ jobs:
   - name: gate-grenade-devstack-vm-stable
     branch: ^(stable/grizzly).*$
     voting: false
+    # Remove when gate-grenade-devstack-vm-stable is
+    # merged into gate-grenade-devstack-vm
+  - name: gate-grenade-noop
+    branch: ^(stable/(folsom|grizzly)).*$
   - name: gate-tempest-docs
     branch: ^(?!stable/(folsom|grizzly)).*$
   - name: tempest-docs
@@ -1072,11 +1076,11 @@ projects:
 
   - name: openstack-dev/grenade
     check:
-      - gate-noop
+      - gate-grenade-noop
       - gate-grenade-devstack-vm
       - gate-grenade-devstack-vm-stable
     gate:
-      - gate-noop
+      - gate-grenade-noop
       - gate-grenade-devstack-vm
       - gate-grenade-devstack-vm-stable