From 8728c34c3a54d9ef06639e51c09df6244b5b521a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Dulko?= <michal.dulko@intel.com>
Date: Mon, 7 Nov 2016 16:41:44 +0100
Subject: [PATCH] Set Cinder multinode grenade on master to xenial

Change-Id: If8fa9c6775458cd3e105dc92238739452053caea
---
 jenkins/jobs/devstack-gate.yaml |  2 +-
 jenkins/jobs/projects.yaml      | 15 +++++++++++++--
 zuul/layout.yaml                |  9 +++++++--
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/jenkins/jobs/devstack-gate.yaml b/jenkins/jobs/devstack-gate.yaml
index 12e5d5f2e6..fcec909560 100644
--- a/jenkins/jobs/devstack-gate.yaml
+++ b/jenkins/jobs/devstack-gate.yaml
@@ -1046,7 +1046,7 @@
 
 
 - job-template:
-    name: '{pipeline}-grenade-dsvm-cinder-multinode{job-suffix}'
+    name: '{pipeline}-grenade-dsvm-cinder-multinode-{node-release}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index beee8fc2e1..1f2c17f5e9 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -1219,9 +1219,20 @@
             - compliance
           node:
             - ubuntu-xenial
-      - '{pipeline}-grenade-dsvm-cinder-multinode{job-suffix}':
+      - '{pipeline}-grenade-dsvm-cinder-multinode-{node-release}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty-2-node
+          node:
+            - ubuntu-trusty-2-node
+          node-release:
+            - ubuntu-trusty
+          job-suffix: ''
+          branch-override: default
+      - '{pipeline}-grenade-dsvm-cinder-multinode-{node-release}{job-suffix}':
+          pipeline: gate
+          node:
+            - ubuntu-xenial-2-node
+          node-release:
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
       - api-ref-jobs:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7968bb6f64..f70b6a515e 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2299,6 +2299,9 @@ jobs:
   - name: ^gate-cinder-tox-compliance-ubuntu-xenial$
     branch: ^(?!stable/(liberty|mitaka)).*$
 
+  - name: gate-grenade-dsvm-cinder-multinode-ubuntu-trusty
+    branch: ^stable/mitaka.*$
+
   - name: dev-zuul-coverage
     voting: false
 
@@ -6209,7 +6212,8 @@ projects:
       - gate-cinder-tox-db-functional-ubuntu-trusty
       - gate-cinder-tox-db-functional-ubuntu-xenial
       - gate-cinder-tox-compliance-ubuntu-xenial
-      - gate-grenade-dsvm-cinder-multinode
+      - gate-grenade-dsvm-cinder-multinode-ubuntu-trusty
+      - gate-grenade-dsvm-cinder-multinode-ubuntu-xenial
       # These jobs test open source plugins and must remain with the -nv branch
       # designator unless cinder gives permission.
       - gate-tempest-dsvm-full-sheepdog-nv
@@ -6221,7 +6225,8 @@ projects:
       - gate-tempest-dsvm-full-devstack-plugin-ceph-ubuntu-trusty
       - gate-tempest-dsvm-full-devstack-plugin-ceph-ubuntu-xenial
       - gate-cinder-tox-compliance-ubuntu-xenial
-      - gate-grenade-dsvm-cinder-multinode
+      - gate-grenade-dsvm-cinder-multinode-ubuntu-trusty
+      - gate-grenade-dsvm-cinder-multinode-ubuntu-xenial
     experimental:
       - gate-grenade-dsvm-forward
       - gate-tempest-dsvm-full-sheepdog-src-os-brick-nv