From 09d41349ccaa121f688402460cdc539a39e01384 Mon Sep 17 00:00:00 2001
From: Amrith Kumar <amrith@amrith.org>
Date: Mon, 21 Nov 2016 14:04:20 -0500
Subject: [PATCH] make a non-voting gate-trove-functional-mysql-ubuntu-xenial
 job

The goal of this commit is to create a single non-voting
gate-trove-functional-mysql-ubuntu-xenial job that will only run in
the master branch of the trove project. It will be used to verify a
change that will make it possible to run the trove CI jobs for master
on xenial nodes.

Change-Id: Ibc0ac0ae205a748ffaa7fb4c8e4305d75515aae1
---
 jenkins/jobs/projects.yaml | 11 ++++++++---
 jenkins/jobs/trove.yaml    |  4 ++--
 zuul/layout.yaml           |  9 +++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 22d322413e..d79f0b426d 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -15174,10 +15174,15 @@
       - install-guide-jobs:
           service: database
       - periodic-python-jobs-with-oslo-master
-      - 'gate-trove-functional-dsvm-{datastore}{job-suffix}':
-          datastore:
-            - 'mysql'
+      - 'gate-trove-functional-dsvm-{datastore}-{node}{job-suffix}':
+          datastore: 'mysql'
           job-suffix: ''
+          node: 'ubuntu-trusty'
+          branch-override: default
+      - 'gate-trove-functional-dsvm-{datastore}-{node}{job-suffix}':
+          datastore: 'mysql'
+          job-suffix: '-nv'
+          node: 'ubuntu-xenial'
           branch-override: default
       - 'gate-trove-legacy-functional-dsvm-{datastore}{job-suffix}':
           datastore: 'mysql'
diff --git a/jenkins/jobs/trove.yaml b/jenkins/jobs/trove.yaml
index 725f839e6c..b001e1cdcf 100644
--- a/jenkins/jobs/trove.yaml
+++ b/jenkins/jobs/trove.yaml
@@ -112,8 +112,8 @@
 
 - job-template:
     description: This job uses image elements in the trove repository.
-    name: 'gate-trove-functional-dsvm-{datastore}{job-suffix}'
-    node: ubuntu-trusty
+    name: 'gate-trove-functional-dsvm-{datastore}-{node}{job-suffix}'
+    node: '{node}'
 
     wrappers:
       - build-timeout:
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index caef7ebb42..8f26bbf6b8 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -15848,10 +15848,10 @@ projects:
       - name: lib-forward-testing
       - name: release-notes-jobs
     check:
-      - gate-trove-functional-dsvm-mysql
+      - gate-trove-functional-dsvm-mysql-ubuntu-trusty
       - gate-trove-legacy-functional-dsvm-mysql
     gate:
-      - gate-trove-functional-dsvm-mysql
+      - gate-trove-functional-dsvm-mysql-ubuntu-trusty
       - gate-trove-legacy-functional-dsvm-mysql
 
   - name: openstack/python-vitrageclient
@@ -17652,7 +17652,8 @@ projects:
       - name: periodic-jobs-with-oslo-master
       - name: api-ref-jobs
     check:
-      - gate-trove-functional-dsvm-mysql
+      - gate-trove-functional-dsvm-mysql-ubuntu-trusty
+      - gate-trove-functional-dsvm-mysql-ubuntu-xenial-nv
       - gate-trove-legacy-functional-dsvm-mysql
       - gate-tempest-dsvm-trove
       - gate-trove-scenario-functional-dsvm-mariadb-nv
@@ -17668,7 +17669,7 @@ projects:
       - gate-trove-tox-db-apiexamples-ubuntu-xenial
       - gate-trove-tox-pylint-ubuntu-xenial
     gate:
-      - gate-trove-functional-dsvm-mysql
+      - gate-trove-functional-dsvm-mysql-ubuntu-trusty
       - gate-trove-legacy-functional-dsvm-mysql
       - gate-trove-scenario-functional-dsvm-mysql
       - gate-trove-scenario-functional-dsvm-redis