From ac272314319ede20345c57dd6f3bc82a5ba069cf Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Wed, 7 Dec 2016 07:19:53 +0100
Subject: [PATCH] Switch to Xenial: python-barbicanclient

Update python-barbicanclient dsvm job for changes merged on branches >=
master to run on Xenial. Changes merged on older branches will run
on Trusty.

Change-Id: Iafab0c9d5126f19a4a79bf26596ddd2c133ccf83
---
 jenkins/jobs/projects.yaml              |  4 ++++
 jenkins/jobs/python-barbicanclient.yaml | 14 +++++++-------
 zuul/layout.yaml                        |  6 ++++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 34556a2114..34777c9f5e 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -12688,6 +12688,10 @@
           suffix: '-nv'
       - openstack-client-publish-jobs
       - pypi-jobs
+      - gate-python-barbicanclient-devstack-dsvm-{node}:
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
 
 - project:
     name: python-bileanclient
diff --git a/jenkins/jobs/python-barbicanclient.yaml b/jenkins/jobs/python-barbicanclient.yaml
index a9d817d3d3..d04970c962 100644
--- a/jenkins/jobs/python-barbicanclient.yaml
+++ b/jenkins/jobs/python-barbicanclient.yaml
@@ -1,6 +1,6 @@
-- job:
-    name: gate-python-barbicanclient-devstack-dsvm
-    node: ubuntu-trusty
+- job-template:
+    name: 'gate-python-barbicanclient-devstack-dsvm-{node}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
@@ -18,15 +18,15 @@
           export PROJECTS="openstack/barbican $PROJECTS"
           export PROJECTS="openstack/python-barbicanclient $PROJECTS"
 
-          function gate_hook {
+          function gate_hook {{
               $BASE/new/barbican/devstack/gate_hook.sh
-          }
+          }}
           export -f gate_hook
 
-          function post_test_hook {
+          function post_test_hook {{
               cd /opt/stack/new/python-barbicanclient/functionaltests
               ./post_test_hook.sh
-          }
+          }}
           export -f post_test_hook
 
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index f6c8140305..b4e2469d33 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -15089,9 +15089,11 @@ projects:
       - name: check-requirements
       - name: osc-plugin-jobs
     check:
-      - gate-python-barbicanclient-devstack-dsvm
+      - gate-python-barbicanclient-devstack-dsvm-ubuntu-trusty
+      - gate-python-barbicanclient-devstack-dsvm-ubuntu-xenial
     gate:
-      - gate-python-barbicanclient-devstack-dsvm
+      - gate-python-barbicanclient-devstack-dsvm-ubuntu-trusty
+      - gate-python-barbicanclient-devstack-dsvm-ubuntu-xenial
 
   - name: openstack/python-bileanclient
     template: