From e3e73c60f3d52462551a4e88feade19e58b711b9 Mon Sep 17 00:00:00 2001
From: Anastasia Kuznetsova <akuznetsova@mirantis.com>
Date: Wed, 18 Nov 2015 16:05:33 +0300
Subject: [PATCH] Update jobs for mistral

Updated mistral gates configuration, substitute job definition to
job template, split one mistral-devstack gate into two which will
run different suite of tests.

Change-Id: Ie4e6e550c0f9a63d42fe0bde1969341b5979f1d8
---
 jenkins/jobs/mistral.yaml  | 20 ++++++++++++--------
 jenkins/jobs/projects.yaml |  8 ++++++++
 zuul/layout.yaml           |  5 ++++-
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/jenkins/jobs/mistral.yaml b/jenkins/jobs/mistral.yaml
index 6bf8744e41..4841fe4d96 100644
--- a/jenkins/jobs/mistral.yaml
+++ b/jenkins/jobs/mistral.yaml
@@ -1,6 +1,6 @@
-- job:
-    name: gate-mistral-devstack-dsvm
-    node: 'devstack-precise || devstack-trusty'
+- job-template:
+    name: '{pipeline}-{component}-devstack-dsvm'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -15,18 +15,22 @@
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=60
-          export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_NEUTRON=1
-          export ENABLED_SERVICES=h-api,h-api-cfn,h-api-cw,h-eng,heat
+
+          if [ "{component}" = "python-mistralclient" ] ; then
+              export DEVSTACK_PROJECT_FROM_GIT="python-mistralclient"
+          fi
+
+          export ENABLED_SERVICES=h-api,h-api-cfn,h-api-cw,h-eng,heat,tempest
           export PROJECTS="openstack/mistral $PROJECTS"
           export PROJECTS="openstack/mistral-dashboard $PROJECTS"
           export PROJECTS="openstack/python-mistralclient $PROJECTS"
           export DEVSTACK_LOCAL_CONFIG="enable_plugin mistral https://git.openstack.org/openstack/mistral"
 
-          function post_test_hook {
-              cd /opt/stack/new/mistral/functionaltests
+          function post_test_hook {{
+              cd /opt/stack/new/{component}/functionaltests
               ./post_test_hook.sh
-          }
+          }}
           export -f post_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 1a9054c29a..cd0e962d4e 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2489,6 +2489,10 @@
       - python-jobs
       - pypi-jobs
       - openstack-publish-jobs
+      - '{pipeline}-{component}-devstack-dsvm':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          component: mistral
       - gate-rally-dsvm-mistral-{name}:
           name: task
       - gate-{name}-tox-{envlist}:
@@ -5794,6 +5798,10 @@
     jobs:
       - python-jobs
       - pypi-jobs
+      - '{pipeline}-{component}-devstack-dsvm':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          component: python-mistralclient
 
 - project:
     name: python-monascaclient
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b68caa3181..f44cf187fe 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1451,6 +1451,9 @@ jobs:
   - name: gate-mistral-devstack-dsvm
     voting: false
 
+  - name: gate-python-mistralclient-devstack-dsvm
+    voting: false
+
   - name: gate-mistral-dashboard-python34
     voting: false
 
@@ -8121,7 +8124,7 @@ projects:
       - name: python3-jobs
       - name: check-requirements
     check:
-      - gate-mistral-devstack-dsvm
+      - gate-python-mistralclient-devstack-dsvm
 
   - name: openstack/python-monascaclient
     template: