Merge "Set Cinder multinode grenade on master to xenial"

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:

jenkins/jobs/projects.yaml

@@ -1226,9 +1226,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:

zuul/layout.yaml

@@ -2345,6 +2345,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
 
@@ -6314,7 +6317,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
@@ -6326,7 +6330,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