From cae46686ec24dd2da992a4d411c9ce613ffabbb6 Mon Sep 17 00:00:00 2001
From: Victor Ryzhenkin <vryzhenkin@mirantis.com>
Date: Tue, 2 Feb 2016 16:02:36 +0300
Subject: [PATCH] Make murano tempest job voting and add it to gate pipeline

- Make gate-tempest-dsvm-murano-api voting and add it to gate pipeline
- Make gate-murano-devstack-dsvm operable only for kilo and liberty branches

Change-Id: I6a9fb7d8657de7f6bd59ef6c4103d9de7d505fdd
Depends-On: I76d4356e15a2b844734d434cb6f3ed58f9ccb5ab
Targets: blueprint migrate-to-tempest-plugin
---
 jenkins/jobs/murano.yaml | 3 +--
 zuul/layout.yaml         | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/jenkins/jobs/murano.yaml b/jenkins/jobs/murano.yaml
index aa5d0e53eb..a273267e81 100644
--- a/jenkins/jobs/murano.yaml
+++ b/jenkins/jobs/murano.yaml
@@ -215,8 +215,7 @@
           if [ "{mode}" = "cfapi" ]; then
               export ENABLED_SERVICES+=,murano-cfapi
               export DEVSTACK_GATE_TEMPEST_REGEX="service_broker"
-          fi
-          if [ "{mode}" = "api" ]; then
+          elif [ "{mode}" = "api" ]; then
               export DEVSTACK_GATE_TEMPEST_REGEX="application_catalog"
           fi
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e24bff522d..137750c004 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1699,7 +1699,7 @@ jobs:
     branch: ^(?!stable/(?:juno|kilo)).*$
 
   - name: gate-murano-devstack-dsvm
-    branch: ^(?!stable/juno).*$
+    branch: ^(stable/(?:kilo|liberty)).*$
 
   - name: gate-rally-dsvm-murano-task
     branch: ^(?!stable/juno).*$
@@ -1715,7 +1715,6 @@ jobs:
 
   - name: gate-tempest-dsvm-murano-api
     branch: ^(?!stable/(?:juno|kilo|liberty)).*$
-    voting: false
 
   - name: gate-murano-pylint
     branch: ^(?!stable/juno).*$
@@ -6446,6 +6445,7 @@ projects:
       - gate-tempest-dsvm-murano-api
       - gate-tempest-dsvm-murano-cfapi
     gate:
+      - gate-tempest-dsvm-murano-api
       - gate-murano-devstack-dsvm
     post:
       - murano-coverage