From 3a86d58fefbd33d8a4898856dded7ff78ce47983 Mon Sep 17 00:00:00 2001
From: K Jonathan Harker <k.jonathan.harker@hp.com>
Date: Wed, 28 May 2014 17:54:55 -0700
Subject: [PATCH] Also run puppet-apply test on bare-centos6

Test our puppet config on both precise and centos6.

Change-Id: I3aa227c27a8c6979883941ce6b16ed362b80338b
---
 .../config/puppet-module-jobs.yaml            | 21 +++++++++++++++++--
 .../openstack_project/files/zuul/layout.yaml  | 10 ++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
index 7445d49b16..f58e47a17d 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/puppet-module-jobs.yaml
@@ -40,8 +40,8 @@
       - console-log
 
 - job-template:
-    name: 'gate-{name}-puppet-apply'
-    node: '{node}'
+    name: 'gate-{name}-puppet-apply-precise'
+    node: bare-precise
 
     builders:
       - gerrit-git-prep
@@ -50,6 +50,23 @@
     publishers:
       - console-log
 
+- job-template:
+    name: 'gate-{name}-puppet-apply-centos6'
+    node: bare-centos6
+
+    builders:
+      - gerrit-git-prep
+      - puppet-apply
+
+    publishers:
+      - console-log
+
+- job-group:
+    name: 'gate-{name}-puppet-apply'
+    jobs:
+      - 'gate-{name}-puppet-apply-centos6'
+      - 'gate-{name}-puppet-apply-precise'
+
 - job-group:
     name: 'puppet-module-unit'
     puppet_version:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index ab59e4f2e7..5a7b046d19 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -587,7 +587,9 @@ jobs:
     voting: false
   - name: gate-puppet-vswitch-puppet-syntax
     voting: false
-  - name: gate-config-puppet-apply
+  - name: gate-config-puppet-apply-precise
+    voting: false
+  - name: gate-config-puppet-apply-centos6
     voting: false
   - name: gate-tomograph-python33
     voting: false
@@ -2813,7 +2815,7 @@ projects:
       - gate-config-pep8
       - gate-config-puppet-lint
       - gate-config-puppet-syntax
-      - gate-config-puppet-apply
+      - gate-config-puppet-apply-precise
       - gate-config-irc-access
       - gate-ci-docs
       - check-projects-yaml-alphabetized
@@ -2823,12 +2825,14 @@ projects:
       - gate-config-pep8
       - gate-config-puppet-lint
       - gate-config-puppet-syntax
-      - gate-config-puppet-apply
+      - gate-config-puppet-apply-precise
       - gate-config-irc-access
       - check-projects-yaml-alphabetized
       - check-projects-yaml-upstream
     post:
       - ci-docs
+    experimental:
+      - gate-config-puppet-apply-centos6
 
   - name: openstack-infra/devstack-gate
     template: