[sahara] Transition remaining jobs to xenial

Changing nodes to use xenial instead of trusty and moving some node
definitions to projects.yaml

Change-Id: I15548df698fa7be75a4f13e96bdbc181f4921cd5

jenkins/jobs/projects.yaml

@@ -13215,9 +13215,11 @@
           job-suffix: ''
           branch-override: default
           network: neutron
-      - '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{job-suffix}':
+      - '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
 
@@ -13809,19 +13811,25 @@
       - translation-jobs
       - translation-jobs-mitaka
       - gate-{name}-pylint
-      - '{pipeline}-tempest-dsvm-sahara{job-suffix}':
+      - '{pipeline}-tempest-dsvm-sahara-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-sahara{job-suffix}':
+      - '{pipeline}-tempest-dsvm-sahara-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-{name}-cli{job-suffix}':
+      - '{pipeline}-{name}-cli-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: '-nv'
           branch-override: default
       - '{pipeline}-{name}-dsvm-scenario-{network}-{node}{job-suffix}':
@@ -13872,6 +13880,10 @@
             - py27dj110
           node:
             - ubuntu-xenial
+      - 'gate-sahara-dashboard-dsvm-integration-{node}':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
 
 - project:
     name: sahara-extra
@@ -13882,6 +13894,10 @@
       - python-jobs
       - openstack-publish-jobs
       - openstack-server-release-jobs
+      - 'gate-sahara-extra-artifacts':
+          node: ubuntu-xenial
+      - 'post-sahara-extra-artifacts':
+          node: ubuntu-xenial
 
 - project:
     name: sahara-image-elements
@@ -13890,20 +13906,18 @@
     jobs:
       - python-jobs
       - pypi-jobs
-      - 'gate-sahara-buildimages-{plugin}':
-          plugin: vanilla
-      - 'gate-sahara-buildimages-{plugin}':
-          plugin: cloudera
-      - 'gate-sahara-buildimages-{plugin}':
-          plugin: spark
-      - 'gate-sahara-buildimages-{plugin}':
-          plugin: storm
-      - 'gate-sahara-buildimages-{plugin}':
-          plugin: mapr
-      - 'gate-sahara-buildimages-{plugin}':
-          plugin: ambari
-      - 'gate-sahara-buildimages-{plugin}':
-          plugin: plain
+      - 'gate-sahara-buildimages-{plugin}-{node}':
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
+          plugin:
+            - vanilla
+            - cloudera
+            - spark
+            - storm
+            - mapr
+            - ambari
+            - plain
 
 - project:
     name: sahara-specs

jenkins/jobs/sahara.yaml

@@ -1,6 +1,6 @@
-- job:
-    name: gate-sahara-dashboard-dsvm-integration
-    node: ubuntu-trusty
+- job-template:
+    name: 'gate-sahara-dashboard-dsvm-integration-{node}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -24,16 +24,16 @@
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin sahara-dashboard git://git.openstack.org/openstack/sahara-dashboard"
           export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"
 
-          function pre_test_hook {
+          function pre_test_hook {{
               cd /opt/stack/new/sahara-dashboard/tools/gate/integration
               ./pre_test_hook.sh
-          }
+          }}
           export -f pre_test_hook
 
-          function post_test_hook {
+          function post_test_hook {{
               cd /opt/stack/new/sahara-dashboard/tools/gate/integration
               ./post_test_hook.sh
-          }
+          }}
           export -f post_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
@@ -45,8 +45,8 @@
 
 
 - job-template:
-    name: 'gate-sahara-buildimages-{plugin}'
-    node: ubuntu-trusty
+    name: 'gate-sahara-buildimages-{plugin}-{node}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -92,9 +92,9 @@
               copy-after-failure: false
 
 
-- job:
+- job-template:
     name: 'gate-sahara-extra-artifacts'
-    node: ubuntu-xenial
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -112,9 +112,9 @@
       - console-log
 
 
-- job:
+- job-template:
     name: 'post-sahara-extra-artifacts'
-    node: ubuntu-xenial
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -134,7 +134,7 @@
 
 
 - job-template:
-    name: '{pipeline}-{name}-cli{job-suffix}'
+    name: '{pipeline}-{name}-cli-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -179,7 +179,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-sahara{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-sahara-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -333,7 +333,7 @@
 
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-neutron-src-python-saharaclient-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:

zuul/layout.yaml

@@ -2609,7 +2609,7 @@ jobs:
   - name: ^sahara-coverage-db-ubuntu-(trusty|xenial)
     voting: false
 
-  - name: gate-sahara-dashboard-dsvm-integration
+  - name: ^gate-sahara-dashboard-dsvm-integration.*$
     voting: false
 
   - name: ^gate-sahara-dashboard-tox-py27dj110-ubuntu-xenial$
@@ -15732,18 +15732,22 @@ projects:
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: publish-to-pypi
-      - name: lib-forward-testing
       - name: release-notes-jobs
       - name: osc-plugin-jobs
     check:
       - gate-python-saharaclient-python34
-      - gate-sahara-cli-nv
+      - gate-sahara-cli-ubuntu-trusty-nv
+      - gate-sahara-cli-ubuntu-xenial-nv
       - gate-python-saharaclient-dsvm-scenario-neutron-ubuntu-xenial
+      - gate-tempest-dsvm-neutron-src-python-saharaclient-ubuntu-trusty
+      - gate-tempest-dsvm-neutron-src-python-saharaclient-ubuntu-xenial
     post:
       - python-saharaclient-coverage-ubuntu-trusty
       - python-saharaclient-coverage-ubuntu-xenial
     gate:
       - gate-python-saharaclient-dsvm-scenario-neutron-ubuntu-xenial
+      - gate-tempest-dsvm-neutron-src-python-saharaclient-ubuntu-trusty
+      - gate-tempest-dsvm-neutron-src-python-saharaclient-ubuntu-xenial
     experimental:
       - gate-python-saharaclient-pypy
 
@@ -16272,7 +16276,8 @@ projects:
       - name: api-ref-jobs
     check:
       - gate-sahara-pylint
-      - gate-tempest-dsvm-sahara
+      - gate-tempest-dsvm-sahara-ubuntu-trusty
+      - gate-tempest-dsvm-sahara-ubuntu-xenial
       - sahara-coverage-db-ubuntu-trusty
       - sahara-coverage-db-ubuntu-xenial
       - gate-grenade-dsvm-sahara
@@ -16283,7 +16288,8 @@ projects:
       - gate-sahara-dsvm-scenario-neutron-ubuntu-xenial
       - gate-sahara-dsvm-scenario-neutron-ubuntu-trusty
       - gate-sahara-dsvm-scenario-nova-ubuntu-trusty
-      - gate-tempest-dsvm-sahara
+      - gate-tempest-dsvm-sahara-ubuntu-trusty
+      - gate-tempest-dsvm-sahara-ubuntu-xenial
     post:
       - sahara-coverage-db-ubuntu-trusty
       - sahara-coverage-db-ubuntu-xenial
@@ -16314,7 +16320,8 @@ projects:
       - gate-sahara-dashboard-python27-ubuntu-trusty
       - gate-sahara-dashboard-pep8-ubuntu-xenial
       - gate-sahara-dashboard-python27-ubuntu-xenial
-      - gate-sahara-dashboard-dsvm-integration
+      - gate-sahara-dashboard-dsvm-integration-ubuntu-xenial
+      - gate-sahara-dashboard-dsvm-integration-ubuntu-trusty
       - gate-sahara-dashboard-tox-py27dj19-ubuntu-xenial
       - gate-sahara-dashboard-tox-py27dj110-ubuntu-xenial
     gate:
@@ -16353,17 +16360,25 @@ projects:
     check:
       - gate-sahara-image-elements-pep8-ubuntu-trusty
       - gate-sahara-image-elements-pep8-ubuntu-xenial
-      - gate-sahara-buildimages-vanilla
-      - gate-sahara-buildimages-cloudera
-      - gate-sahara-buildimages-spark
-      - gate-sahara-buildimages-storm
-      - gate-sahara-buildimages-mapr
-      - gate-sahara-buildimages-ambari
-      - gate-sahara-buildimages-plain
+      - gate-sahara-buildimages-vanilla-ubuntu-trusty
+      - gate-sahara-buildimages-cloudera-ubuntu-trusty
+      - gate-sahara-buildimages-spark-ubuntu-trusty
+      - gate-sahara-buildimages-storm-ubuntu-trusty
+      - gate-sahara-buildimages-mapr-ubuntu-trusty
+      - gate-sahara-buildimages-ambari-ubuntu-trusty
+      - gate-sahara-buildimages-plain-ubuntu-trusty
+      - gate-sahara-buildimages-vanilla-ubuntu-xenial
+      - gate-sahara-buildimages-cloudera-ubuntu-xenial
+      - gate-sahara-buildimages-spark-ubuntu-xenial
+      - gate-sahara-buildimages-storm-ubuntu-xenial
+      - gate-sahara-buildimages-mapr-ubuntu-xenial
+      - gate-sahara-buildimages-ambari-ubuntu-xenial
+      - gate-sahara-buildimages-plain-ubuntu-xenial
     gate:
       - gate-sahara-image-elements-pep8-ubuntu-trusty
       - gate-sahara-image-elements-pep8-ubuntu-xenial
-      - gate-sahara-buildimages-vanilla
+      - gate-sahara-buildimages-vanilla-ubuntu-trusty
+      - gate-sahara-buildimages-vanilla-ubuntu-xenial
     post:
       - sahara-image-elements-branch-tarball
 
@@ -16387,9 +16402,11 @@ projects:
       - name: release-notes-jobs
     check:
       - gate-sahara-tests-pylint
-      - gate-tempest-dsvm-sahara-nv
+      - gate-tempest-dsvm-sahara-ubuntu-trusty-nv
+      - gate-tempest-dsvm-sahara-ubuntu-xenial-nv
       - gate-sahara-tests-dsvm-scenario-neutron-ubuntu-xenial
-      - gate-sahara-cli-nv
+      - gate-sahara-cli-ubuntu-xenial-nv
+      - gate-sahara-cli-ubuntu-trusty-nv
       - sahara-tests-coverage-ubuntu-trusty
       - sahara-tests-coverage-ubuntu-xenial
     gate: