From 50e2764a5e24069aaa173ef8d1fac41a01908463 Mon Sep 17 00:00:00 2001
From: Nate Johnston <nate_johnston@cable.comcast.com>
Date: Tue, 23 Aug 2016 16:11:28 +0000
Subject: [PATCH] Make neutron-fwaas functional job not experimental

With the advent of additional functional tests, the functional test job
for neutron-fwaas should be moved from the check-experimental queue to
the check queue.  The job is also changed to be voting.

Depends-On: I5c7eab23f3a069721887e6365d563dd9b64805d5

Change-Id: Idef9074f770f545f9e37e3477e56932aeb58748f
---
 zuul/layout.yaml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index bae55d0689..1c956392d9 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2002,7 +2002,7 @@ jobs:
     voting: false
 
   - name: ^gate-neutron-fwaas-dsvm-functional$
-    voting: false
+    branch: ^(?!stable/(liberty|mitaka)).*$
 
   - name: ^gate-neutron-fwaas-dsvm-tempest$
     branch: ^(?!stable/liberty).*$
@@ -10872,11 +10872,12 @@ projects:
       - name: translation-jobs
     check:
       - gate-neutron-fwaas-dsvm-tempest
+      - gate-neutron-fwaas-dsvm-functional
+    gate:
+      - gate-neutron-fwaas-dsvm-functional
     post:
       - neutron-fwaas-coverage-ubuntu-trusty
       - neutron-fwaas-coverage-ubuntu-xenial
-    experimental:
-      - gate-neutron-fwaas-dsvm-functional
 
   - name: openstack/neutron-lbaas
     template: