From 34b2887a9995f23d9978fbda2974cc6f262bb5ad Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.de>
Date: Fri, 5 Dec 2014 07:33:06 +0100
Subject: [PATCH] Fix puppet gate check jobs naming

Use puppet-check-jobs template instead of
gate-system-config-puppet... for these puppet jobs to fix a copy/paste
error.
gate-system-config is not doing anything special, it's the same job
definition as the one used by the template but now the names are
correct.

Change-Id: I37eaa6e0a88e0563f04cfacb2e0bcf722f7be8bd
---
 jenkins/jobs/projects.yaml | 16 ++++++++++++++++
 zuul/layout.yaml           | 21 +++------------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 789b1c7d02..1d5e434dbe 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -2417,6 +2417,22 @@
     jobs:
       - puppet-check-jobs
 
+- project:
+    name: puppet-vinz
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - puppet-check-jobs
+
+- project:
+    name: puppet-yum
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - puppet-check-jobs
+
 - project:
     name: puppet-zanata
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 849e62bc55..91a946aefd 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3650,22 +3650,12 @@ projects:
   - name: openstack-infra/puppet-vinz
     template:
       - name: merge-check
-    check:
-      - gate-system-config-puppet-lint
-      - gate-system-config-puppet-syntax
-    gate:
-      - gate-system-config-puppet-lint
-      - gate-system-config-puppet-syntax
+      - name: puppet-check-jobs
 
   - name: openstack-infra/puppet-yum
     template:
       - name: merge-check
-    check:
-      - gate-system-config-puppet-lint
-      - gate-system-config-puppet-syntax
-    gate:
-      - gate-system-config-puppet-lint
-      - gate-system-config-puppet-syntax
+      - name: puppet-check-jobs
 
   - name: openstack-infra/puppet-zanata
     template:
@@ -3675,12 +3665,7 @@ projects:
   - name: openstack-infra/puppet-zuul
     template:
       - name: merge-check
-    check:
-      - gate-system-config-puppet-lint
-      - gate-system-config-puppet-syntax
-    gate:
-      - gate-system-config-puppet-lint
-      - gate-system-config-puppet-syntax
+      - name: puppet-check-jobs
 
   - name: openstack-infra/pypi-mirror
     template: