From eb4adbe00984c6c8e96e8a37d8cdb5e03f2ec8c6 Mon Sep 17 00:00:00 2001
From: Maru Newby <marun@redhat.com>
Date: Sat, 10 May 2014 00:13:45 +0000
Subject: [PATCH] Allow the neutron functional job to gate merges

The neutron functional job (neutron-dsvm-functional) has been passing
consistently as a non-voting check job.  It needs to be allowed to
vote and gate merges for functional test additions to be useful.

Implements: blueprint neutron-testing-refactor

Change-Id: I296570049c84472228ea2b8c776a58cb3c50b901
---
 .../files/jenkins_job_builder/config/projects.yaml           | 5 +++++
 modules/openstack_project/files/zuul/layout.yaml             | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 55586a89dd..76f6497fa4 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1001,6 +1001,11 @@
       - python-havana-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
+      - '{pipeline}-neutron-dsvm-functional{branch-designator}':
+          pipeline: gate
+          node: devstack-precise
+          branch-designator: ''
+          branch-override: default
       - '{pipeline}-neutron-dsvm-functional{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-precise-check'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 7813bd05b8..bde4b902b9 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -567,7 +567,8 @@ jobs:
     voting: false
   - name: check-neutron-dsvm-functional
     branch: ^(?!stable/havana).*$
-    voting: false
+  - name: gate-neutron-dsvm-functional
+    branch: ^(?!stable/havana).*$
   - name: check-neutron-dsvm-api
     branch: ^(?!stable/(havana|icehouse)).*$
     voting: false
@@ -914,6 +915,7 @@ projects:
       - check-tempest-dsvm-neutron-2
       - check-tempest-dsvm-neutron-pg-2
     gate:
+      - gate-neutron-dsvm-functional
       - gate-tempest-dsvm-neutron-2
       - gate-tempest-dsvm-neutron-pg-2
     experimental:
@@ -2532,6 +2534,7 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm-forward
       - gate-grenade-dsvm-partial-ncpu
+      - gate-neutron-dsvm-functional
       - gate-swift-dsvm-functional
     experimental:
       - check-tempest-dsvm-cells-full