From be56c251d6b26245d42d24e3b323cdca5d15fe6d Mon Sep 17 00:00:00 2001
From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Tue, 25 Sep 2012 15:48:27 -0400
Subject: [PATCH] Add gate-ci-puppet-lint job

With help from gate-ci-puppet-syntax, we now have gate-ci-puppet-lint.  We
also added a top level Rakefile that uses an upstream gem called
puppetlabs_spec_helper. A powerful little wrapper that gives us some cool
new testing tools for puppet.

Change-Id: If6e06bf632deb0680869ed963c934ff8ee8a783f
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>
Reviewed-on: https://review.openstack.org/13660
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
---
 modules/Rakefile                                  |  2 ++
 modules/jenkins/manifests/slave.pp                | 10 ++++++++++
 .../config/openstack-ci-puppet.yaml               | 15 +++++++++++++++
 modules/openstack_project/files/zuul/layout.yaml  |  4 ++++
 4 files changed, 31 insertions(+)
 create mode 100644 modules/Rakefile

diff --git a/modules/Rakefile b/modules/Rakefile
new file mode 100644
index 0000000000..14f1c24622
--- /dev/null
+++ b/modules/Rakefile
@@ -0,0 +1,2 @@
+require 'rubygems'
+require 'puppetlabs_spec_helper/rake_tasks'
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index 5f34bb3d85..0bdd3b99d1 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -65,6 +65,16 @@ class jenkins::slave($ssh_key, $sudo = false, $bare = false, $user = true) {
       require => Class[pip]
     }
 
+    $gem_packages = [
+      'puppet-lint',
+      'puppetlabs_spec_helper',
+    ]
+
+    package { $gem_packages:
+      ensure => latest,
+      provider => gem,
+    }
+
     package { 'git-review':
       ensure => '1.17',
       provider => pip,
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
index 2a113a9034..6da9e6d6e6 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/openstack-ci-puppet.yaml
@@ -14,6 +14,21 @@
       - console-log
 
 
+- job:
+    name: gate-ci-puppet-lint
+    node: precise
+
+    triggers:
+      - zuul
+
+    builders:
+      - gerrit-git-prep
+      - shell: "rake lint"
+
+    publishers:
+      - console-log
+
+
 - job:
     name: ci-puppet-compare-xml
     node: precise
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 37f6600043..a8d938aa8c 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -70,6 +70,8 @@ jobs:
     voting: false
     failure-message: Jenkins XML output has changed.
     success-message: Jenkins XML output is unchanged.
+  - name: gate-ci-puppet-lint
+    voting: false
 
 
 projects:
@@ -180,10 +182,12 @@ projects:
     check:
       - gate-ci-puppet-merge:
         - gate-ci-puppet-syntax
+        - gate-ci-puppet-lint
         - ci-puppet-compare-xml
     gate:
       - gate-ci-puppet-merge:
         - gate-ci-puppet-syntax
+        - gate-ci-puppet-lint
 
   - name: openstack-ci/puppet-apparmor
     check: