From 8c396f4d9deba453a0392535243ed103f3b06e2f Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien.macchi@enovance.com>
Date: Thu, 1 Aug 2013 00:23:17 +0200
Subject: [PATCH] Add heat puppet module to stackforge

Fix bug #1207104

Change-Id: Id0101de07837844b13aa16c8c6ab2f1759bf87b4
---
 .../gerritbot/files/gerritbot_channel_config.yaml  |  1 +
 .../files/jenkins_job_builder/config/projects.yaml | 11 +++++++++++
 modules/openstack_project/files/zuul/layout.yaml   | 14 ++++++++++++++
 .../templates/review.projects.yaml.erb             |  4 ++++
 4 files changed, 30 insertions(+)

diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index 94005732e0..2035da9a03 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -220,6 +220,7 @@ puppet-openstack:
       - stackforge/puppet-ceilometer
       - stackforge/puppet-cinder
       - stackforge/puppet-glance
+      - stackforge/puppet-heat
       - stackforge/puppet-horizon
       - stackforge/puppet-keystone
       - stackforge/puppet-nova
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 61d1167d9a..31fa5c45b8 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -990,6 +990,17 @@
       - gate-{name}-puppet-syntax
       - puppet-module-unit
 
+- project:
+    name: puppet-heat
+    github-org: stackforge
+    node: precise
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - gate-{name}-puppet-lint
+      - gate-{name}-puppet-syntax
+      - puppet-module-unit
+
 - project:
     name: puppet-nova
     github-org: stackforge
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 13b167c709..7038dbef70 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1994,6 +1994,20 @@ projects:
       - gate-puppet-glance-puppet-unit-3.0
       - gate-puppet-glance-puppet-unit-3.1
 
+  - name: stackforge/puppet-heat
+    check:
+      - gate-puppet-heat-puppet-lint
+      - gate-puppet-heat-puppet-syntax
+      - gate-puppet-heat-puppet-unit-2.7
+      - gate-puppet-heat-puppet-unit-3.0
+      - gate-puppet-heat-puppet-unit-3.1
+    gate:
+      - gate-puppet-heat-puppet-lint
+      - gate-puppet-heat-puppet-syntax
+      - gate-puppet-heat-puppet-unit-2.7
+      - gate-puppet-heat-puppet-unit-3.0
+      - gate-puppet-heat-puppet-unit-3.1
+
   - name: stackforge/puppet-horizon
     check:
       - gate-puppet-horizon-puppet-lint
diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb
index b700580fde..9b2e03401f 100644
--- a/modules/openstack_project/templates/review.projects.yaml.erb
+++ b/modules/openstack_project/templates/review.projects.yaml.erb
@@ -207,6 +207,10 @@
   description: OpenStack Glance Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/puppetlabs/puppetlabs-glance.git
+- project: stackforge/puppet-heat
+  description: OpenStack Heat Puppet Module
+  acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
+  upstream: git://github.com/enovance/puppet-heat.git
 - project: stackforge/puppet-horizon
   description: OpenStack Horizon Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config