From ac4ef44d8ac1e1bbd6697618ddaea981f25c7970 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Thu, 30 Mar 2017 12:24:59 -0700
Subject: [PATCH] Rename LOCI template

Provide a shortname parameter to LOCI jobs so that the template
can be descriptive, and we end up with job names like:

  gate-loci-nova-ubuntu-xenial

Change-Id: I68ad759139517a52d2a73c3b02104aeda8275086
---
 jenkins/jobs/loci-jobs.yaml | 4 ++--
 jenkins/jobs/projects.yaml  | 7 +++++++
 zuul/layout.yaml            | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/jenkins/jobs/loci-jobs.yaml b/jenkins/jobs/loci-jobs.yaml
index a85b2487f7..f4d5d8fdb4 100644
--- a/jenkins/jobs/loci-jobs.yaml
+++ b/jenkins/jobs/loci-jobs.yaml
@@ -7,7 +7,7 @@
               git://git.openstack.org openstack/loci
 
 - job-template:
-    name: 'gate-{name}-image-builder-{node}'
+    name: 'gate-loci-{shortname}-{node}'
     node: '{node}'
 
     wrappers:
@@ -31,4 +31,4 @@
     name: loci-jobs
     node: ubuntu-xenial
     jobs:
-      - 'gate-{name}-image-builder-{node}'
+      - 'gate-loci-{shortname}-{node}'
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 083e409771..599ed6d5a3 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -6382,42 +6382,49 @@
 
 - project:
     name: loci-cinder
+    shortname: cinder
 
     jobs:
       - loci-jobs
 
 - project:
     name: loci-glance
+    shortname: glance
 
     jobs:
       - loci-jobs
 
 - project:
     name: loci-heat
+    shortname: heat
 
     jobs:
       - loci-jobs
 
 - project:
     name: loci-keystone
+    shortname: keystone
 
     jobs:
       - loci-jobs
 
 - project:
     name: loci-neutron
+    shortname: neutron
 
     jobs:
       - loci-jobs
 
 - project:
     name: loci-nova
+    shortname: nova
 
     jobs:
       - loci-jobs
 
 - project:
     name: loci-requirements
+    shortname: requirements
 
     jobs:
       - loci-jobs
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index b454598501..c44965229b 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -374,9 +374,9 @@ project-templates:
 
   - name: loci-jobs
     check:
-      - 'gate-{name}-image-builder-ubuntu-xenial'
+      - 'gate-{name}-ubuntu-xenial'
     gate:
-      - 'gate-{name}-image-builder-ubuntu-xenial'
+      - 'gate-{name}-ubuntu-xenial'
 
   - name: python-jobs
     check: