From 1cd9cdf71119c645dd47ba30a1038f5e7f32a4e9 Mon Sep 17 00:00:00 2001
From: Fei Long Wang <flwang@catalyst.net.nz>
Date: Thu, 21 Apr 2016 11:33:35 +1200
Subject: [PATCH] Support multi backends for Zaqar tempest job

Now Zaqar supports mongodb and redis as backends. So it would be
nice if the tempest job can support both.

Change-Id: Ie56471c866ff890988d2ced10253051552c73123
---
 jenkins/jobs/projects.yaml | 12 ++++++++++++
 jenkins/jobs/zaqar.yaml    | 12 ++++++------
 zuul/layout.yaml           |  7 +++++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 9bc04597f0..e4499f53a0 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -9229,6 +9229,18 @@
           job-suffix: ''
           branch-override: default
           backend: redis
+      - '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: ''
+          branch-override: default
+          backend: mongodb
+      - '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}':
+          pipeline: gate
+          node: ubuntu-trusty
+          job-suffix: ''
+          branch-override: default
+          backend: redis
 
 - project:
     name: zaqar-specs
diff --git a/jenkins/jobs/zaqar.yaml b/jenkins/jobs/zaqar.yaml
index 9c9069196b..b90e4a4ddd 100644
--- a/jenkins/jobs/zaqar.yaml
+++ b/jenkins/jobs/zaqar.yaml
@@ -89,9 +89,9 @@
       - devstack-logs
       - console-log
 
-- job:
-    name: gate-tempest-dsvm-zaqar
-    node: ubuntu-trusty
+- job-template:
+    name: '{pipeline}-tempest-dsvm-{backend}-zaqar{job-suffix}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -109,10 +109,10 @@
           export ENABLED_SERVICES=tempest
           export DEVSTACK_LOCAL_CONFIG="enable_plugin zaqar git://git.openstack.org/openstack/zaqar"
 
-          function gate_hook {
+          function gate_hook {{
               cd /opt/stack/new/zaqar/devstack/gate
-              ./gate_hook.sh tempest
-          }
+              ./gate_hook.sh tempest {backend}
+          }}
           export -f gate_hook
 
           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 827bd2fd76..c9125d8b25 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1291,7 +1291,9 @@ jobs:
   - name: gate-zaqar-tox-integration
     voting: false
 
-  - name: gate-tempest-dsvm-zaqar
+  # NOTE(flwang) Make tempest jobs non-voting until Zaqar's tempest
+  # environment stablizes
+  - name: ^gate-tempest-dsvm-.*-zaqar$
     voting: false
 
   - name: gate-tempest-dsvm-neutron-nv
@@ -12084,7 +12086,8 @@ projects:
       - gate-dsvm-mongodb-zaqar
       - gate-dsvm-redis-zaqar
       - gate-rally-dsvm-zaqar-zaqar
-      - gate-tempest-dsvm-zaqar
+      - gate-tempest-dsvm-mongodb-zaqar
+      - gate-tempest-dsvm-redis-zaqar
     gate:
       - gate-dsvm-mongodb-zaqar
       - gate-dsvm-redis-zaqar