From 8b4e40a38a54ec52d2760044aa507c9ce1eb670a Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Thu, 8 Dec 2016 22:23:41 +0100
Subject: [PATCH] Switch to Xenial: storyboard

Add xenial jobs for gate-storyboard-js-integration, ensure that the
trusty job runs on master as well since we deploy storyboard
currently on a trusty node.

Change-Id: Ib164216d688d829bff62acd9137526572a7b22e0
---
 jenkins/jobs/projects.yaml   |  6 ++++--
 jenkins/jobs/storyboard.yaml |  6 +++---
 zuul/layout.yaml             | 11 +++++++++--
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 9778b306e7..718e61e03d 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -14857,7 +14857,10 @@
       - 'gate-{name}-python35-db{suffix}':
           suffix: '-nv'
       - pypi-jobs
-      - gate-storyboard-js-integration
+      - gate-storyboard-js-integration-{node}:
+          node:
+            - ubuntu-trusty
+            - ubuntu-xenial
       - infra-publish-jobs
 
 - project:
@@ -14882,7 +14885,6 @@
           suffix: 'master'
       - '{name}-js-release-{suffix}':
           suffix: 'branch'
-      - gate-storyboard-js-integration
 
 - project:
     name: subunit2sql
diff --git a/jenkins/jobs/storyboard.yaml b/jenkins/jobs/storyboard.yaml
index f62c0f5d3a..25d69dce5f 100644
--- a/jenkins/jobs/storyboard.yaml
+++ b/jenkins/jobs/storyboard.yaml
@@ -1,6 +1,6 @@
-- job:
-    name: gate-storyboard-js-integration
-    node: ubuntu-trusty
+- job-template:
+    name: gate-storyboard-js-integration-{node}
+    node: '{node}'
 
     wrappers:
       - build-timeout:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4f809b2b53..618ca40808 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3350,6 +3350,11 @@ jobs:
   - name: ^gate-swift3-tox-s3tests_
     voting: false
 
+  # Trusty job needs to run on master as well for now since
+  # storyboard is deployed currently on trusty from master.
+  - name: gate-storyboard-js-integration-ubuntu-trusty
+    branch: ^master$
+
   # Mutexes
   - name: reprepro-import-debian-openstack-jessie
     mutex: mirror.deb-openstack
@@ -4962,7 +4967,8 @@ projects:
     release:
       - storyboard-infra-docs
     experimental:
-      - gate-storyboard-js-integration
+      - gate-storyboard-js-integration-ubuntu-trusty
+      - gate-storyboard-js-integration-ubuntu-xenial
 
   - name: openstack-infra/storyboard-webclient
     template:
@@ -4983,7 +4989,8 @@ projects:
     release:
       - storyboard-webclient-js-release-master
     experimental:
-      - gate-storyboard-js-integration
+      - gate-storyboard-js-integration-ubuntu-trusty
+      - gate-storyboard-js-integration-ubuntu-xenial
 
   - name: openstack-infra/subunit2sql
     template: