From ec41a480daf5c3454879f3feb98a60018ad69d31 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 7 Dec 2016 10:28:19 -0800
Subject: [PATCH] Move kuryr testing to xenial

There is only a master branch for the project taht runs these jobs so
just shift them forward to xenial.

Change-Id: I149efd4c7290dcc2399d49af7e77e6f17db0b839
---
 jenkins/jobs/kuryr.yaml    |  6 +++---
 jenkins/jobs/projects.yaml | 16 ++++++++--------
 zuul/layout.yaml           | 14 +++++++-------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/jenkins/jobs/kuryr.yaml b/jenkins/jobs/kuryr.yaml
index d16d90e8d0..5912da70ac 100644
--- a/jenkins/jobs/kuryr.yaml
+++ b/jenkins/jobs/kuryr.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-install-dsvm-kuryr-libnetwork{job-suffix}'
+    name: '{pipeline}-install-dsvm-kuryr-libnetwork-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -38,7 +38,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack{job-suffix}'
+    name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
@@ -91,7 +91,7 @@
       - console-log
 
 - job-template:
-    name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally{job-suffix}'
+    name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally-{node}{job-suffix}'
     node: '{node}'
 
     wrappers:
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 266355a40e..8f3ec8dae3 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6593,30 +6593,30 @@
           suffix: ''
       - openstack-publish-jobs
       - pypi-jobs
-      - '{pipeline}-install-dsvm-kuryr-libnetwork{job-suffix}':
+      - '{pipeline}-install-dsvm-kuryr-libnetwork-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node: ubuntu-xenial
           job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack{job-suffix}':
+      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node: ubuntu-xenial
           kuryr_lib-src: ''
           job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack{job-suffix}':
+      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-{node}{job-suffix}':
           pipeline: gate
           node: ubuntu-xenial
           kuryr_lib-src: '-kuryr_lib-src'
           job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally{job-suffix}':
+      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally-{node}{job-suffix}':
           pipeline: gate
-          node: ubuntu-trusty
+          node: ubuntu-xenial
           kuryr_lib-src: ''
           job-suffix: '-nv'
           branch-override: default
-      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally{job-suffix}':
+      - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally-{node}{job-suffix}':
           pipeline: gate
           node: ubuntu-xenial
           kuryr_lib-src: '-kuryr_lib-src'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index a8be3f257e..41c5cd0b5c 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2753,13 +2753,13 @@ jobs:
   # NOTE(limao): Only run these jobs on kuryr-libnetwork master branch,
   # because we do not need to check if kuryr-libnetwork  stable branch
   # can work with kuryr_lib master.
-  - name: gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-nv
+  - name: gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-ubuntu-xenial-nv
     branch: master
 
   # NOTE(limao): Only run these jobs on kuryr-libnetwork master branch,
   # because we do not need to check if kuryr-libnetwork  stable branch
   # can work with kuryr_lib master.
-  - name: gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-nv
+  - name: gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-ubuntu-xenial-nv
     branch: master
 
   - name: gate-solum-infra-guestagent-python34
@@ -10968,11 +10968,11 @@ projects:
     check:
       - kuryr-libnetwork-coverage-ubuntu-trusty
       - kuryr-libnetwork-coverage-ubuntu-xenial
-      - gate-install-dsvm-kuryr-libnetwork-nv
-      - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-nv
-      - gate-kuryr-libnetwork-dsvm-fullstack-nv
-      - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-nv
-      - gate-kuryr-libnetwork-dsvm-rally-nv
+      - gate-install-dsvm-kuryr-libnetwork-ubuntu-xenial-nv
+      - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-ubuntu-xenial-nv
+      - gate-kuryr-libnetwork-dsvm-fullstack-ubuntu-xenial-nv
+      - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-ubuntu-xenial-nv
+      - gate-kuryr-libnetwork-dsvm-rally-ubuntu-xenial-nv
 
   - name: openstack/kwapi
     template: