From b5b8b94a075f4f633d2e61e3f0377c74c82e073a Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 6 Dec 2016 08:26:12 +0100
Subject: [PATCH] Switch to Xenial: python-ironicclient

Switch master and newton jobs to run on xenial, older branches test on
trusty.

Change-Id: Ie74add7c23004d0d881588177c46fdb9ec3b2b69
---
 jenkins/jobs/ironic.yaml   |  4 ++--
 jenkins/jobs/projects.yaml | 12 ++++++++----
 zuul/layout.yaml           | 14 +++++++++-----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/jenkins/jobs/ironic.yaml b/jenkins/jobs/ironic.yaml
index 5b9f28d222..cec8f44820 100644
--- a/jenkins/jobs/ironic.yaml
+++ b/jenkins/jobs/ironic.yaml
@@ -301,7 +301,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-ironicclient-dsvm-functional{job-suffix}'
+    name: '{pipeline}-ironicclient-dsvm-functional-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -844,7 +844,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-tempest-dsvm-python-ironicclient-src{job-suffix}'
+    name: '{pipeline}-tempest-dsvm-python-ironicclient-src-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 44abbfaa68..9c7fa75b85 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -12908,14 +12908,18 @@
       - openstack-client-publish-jobs
       - pypi-jobs
       - openstack-releasenotes-jobs
-      - '{pipeline}-ironicclient-dsvm-functional{job-suffix}':
+      - '{pipeline}-ironicclient-dsvm-functional-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
-      - '{pipeline}-tempest-dsvm-python-ironicclient-src{job-suffix}':
+      - '{pipeline}-tempest-dsvm-python-ironicclient-src-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
           job-suffix: ''
           branch-override: default
 
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e0ecf09849..3586714a23 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1510,7 +1510,7 @@ jobs:
           - ^doc/.*$
   # Skip non-doc jobs for doc-only python-ironicclient changes. Since documents
   # are checked by python-ironicclient-pep8 it should not be skipped.
-  - name: ^gate-(python-ironicclient-(python27|python3[45](-nv)?|pypy)|ironicclient-dsvm-functional|tempest-dsvm-python-ironicclient-src)$
+  - name: ^gate-(python-ironicclient-(python27|python3[45](-nv)?|pypy)|ironicclient-dsvm-functional|tempest-dsvm-python-ironicclient-src)(-ubuntu-.*)?$
     skip-if:
       - project: ^openstack/python-ironicclient$
         all-files-match-any:
@@ -15460,13 +15460,17 @@ projects:
       - name: release-notes-jobs
       - name: osc-plugin-jobs
     check:
-      - gate-tempest-dsvm-python-ironicclient-src
-      - gate-ironicclient-dsvm-functional
+      - gate-tempest-dsvm-python-ironicclient-src-ubuntu-trusty
+      - gate-tempest-dsvm-python-ironicclient-src-ubuntu-xenial
+      - gate-ironicclient-dsvm-functional-ubuntu-trusty
+      - gate-ironicclient-dsvm-functional-ubuntu-xenial
       - python-ironicclient-coverage-ubuntu-trusty
       - python-ironicclient-coverage-ubuntu-xenial
     gate:
-      - gate-tempest-dsvm-python-ironicclient-src
-      - gate-ironicclient-dsvm-functional
+      - gate-tempest-dsvm-python-ironicclient-src-ubuntu-trusty
+      - gate-tempest-dsvm-python-ironicclient-src-ubuntu-xenial
+      - gate-ironicclient-dsvm-functional-ubuntu-trusty
+      - gate-ironicclient-dsvm-functional-ubuntu-xenial
     post:
       - python-ironicclient-coverage-ubuntu-trusty
       - python-ironicclient-coverage-ubuntu-xenial