Switch to xenial: Cinder

Move gate-cinder-dsvm-apache to Xenial. Run older branches on trusty.

Note that the job is non-voting, remove the condition for it and add
instead a -nv suffix.

Change-Id: Idd5254d651a09fd67519ef70c7cefee3605f6391

jenkins/jobs/cinder.yaml

@@ -76,7 +76,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-cinder-dsvm-apache{job-suffix}'
+    name: '{pipeline}-cinder-dsvm-apache-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/projects.yaml

@@ -1240,10 +1240,12 @@
             - ubuntu-xenial
           job-suffix: '-nv'
           swift: '0'
-      - '{pipeline}-cinder-dsvm-apache{job-suffix}':
+      - '{pipeline}-cinder-dsvm-apache-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
-          job-suffix: ''
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
+          job-suffix: '-nv'
           branch-override: default
       - gate-{name}-tox-db-{envlist}-{node}:
           envlist: functional

zuul/layout.yaml

@@ -2303,9 +2303,6 @@ jobs:
     branch: ^(?!stable/liberty).*$
     voting: false
 
-  - name: gate-cinder-dsvm-apache
-    voting: false
-
   - name: ^gate-cinder-pylint$
     voting: false
 
@@ -6253,7 +6250,8 @@ projects:
       - gate-rally-dsvm-cinder-ubuntu-xenial-nv
       - gate-tempest-dsvm-full-devstack-plugin-ceph-ubuntu-trusty
       - gate-tempest-dsvm-full-devstack-plugin-ceph-ubuntu-xenial
-      - gate-cinder-dsvm-apache
+      - gate-cinder-dsvm-apache-ubuntu-trusty-nv
+      - gate-cinder-dsvm-apache-ubuntu-xenial-nv
       - gate-cinder-tox-db-functional-ubuntu-trusty
       - gate-cinder-tox-db-functional-ubuntu-xenial
       - gate-cinder-tox-compliance-ubuntu-xenial