From 2fb6fe8547098439dfb9dd4cfc26756b70859670 Mon Sep 17 00:00:00 2001
From: Matt Ray <matthewhray@gmail.com>
Date: Thu, 23 Jan 2014 16:31:50 -0600
Subject: [PATCH] Create new Chef cookbook-openstack-integration-test for
 Tempest support.

Add stackforge/cookbook-openstack-integration-test as a new cookbook. Once it is
available we will populate the necessary files. Also updated the Gerrit
notifications to include the ops-database, ops-messaging and orchestration
cookbooks which were missing.

Change-Id: If6c7a25becc7642cd5ec07dce189947106698fc8
Addresses: blueprint integration-testing-for-havana
---
 modules/gerritbot/files/gerritbot_channel_config.yaml  | 10 +++++++---
 .../files/jenkins_job_builder/config/projects.yaml     | 10 ++++++++++
 modules/openstack_project/files/review.projects.yaml   |  7 +++++++
 modules/openstack_project/files/zuul/layout.yaml       |  9 +++++++++
 4 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/modules/gerritbot/files/gerritbot_channel_config.yaml b/modules/gerritbot/files/gerritbot_channel_config.yaml
index df5ee2c1be..dbe692f8c7 100644
--- a/modules/gerritbot/files/gerritbot_channel_config.yaml
+++ b/modules/gerritbot/files/gerritbot_channel_config.yaml
@@ -249,14 +249,18 @@ openstack-chef:
       - x-vrif-minus-2
     projects:
       - stackforge/cookbook-openstack-block-storage
-      - stackforge/cookbook-openstack-image
+      - stackforge/cookbook-openstack-common
+      - stackforge/cookbook-openstack-compute
       - stackforge/cookbook-openstack-dashboard
       - stackforge/cookbook-openstack-identity
-      - stackforge/cookbook-openstack-compute
-      - stackforge/cookbook-openstack-common
+      - stackforge/cookbook-openstack-image
+      - stackforge/cookbook-openstack-integration-test
       - stackforge/cookbook-openstack-metering
       - stackforge/cookbook-openstack-network
       - stackforge/cookbook-openstack-object-storage
+      - stackforge/cookbook-openstack-ops-database
+      - stackforge/cookbook-openstack-ops-messaging
+      - stackforge/cookbook-openstack-orchestration
       - stackforge/openstack-chef-repo
     branches:
       - master
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 312bcfb871..c14b922b92 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1652,6 +1652,16 @@
       - gate-{name}-chef-style
       - gate-{name}-chef-unit
 
+- project:
+    name: cookbook-openstack-integration-test
+    github-org: stackforge
+    node: bare-precise
+
+    jobs:
+      - gate-{name}-chef-lint
+      - gate-{name}-chef-style
+      - gate-{name}-chef-unit
+
 - project:
     name: ironic
     github-org: openstack
diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml
index 78f7b1d2b2..d76952277f 100644
--- a/modules/openstack_project/files/review.projects.yaml
+++ b/modules/openstack_project/files/review.projects.yaml
@@ -433,6 +433,13 @@
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
   options:
     - direct-release
+- project: stackforge/cookbook-openstack-integration-test
+  group: openstack-chef
+  docimpact-group: openstack-chef
+  description: Chef Cookbook - OpenStack Integration Testing
+  acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config
+  options:
+    - direct-release
 - project: stackforge/cookbook-openstack-metering
   group: openstack-chef
   docimpact-group: openstack-chef
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index b649e38bd0..491f148055 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -3424,6 +3424,15 @@ projects:
       - gate-cookbook-openstack-orchestration-chef-lint
       - gate-cookbook-openstack-orchestration-chef-unit
 
+  - name: stackforge/cookbook-openstack-integration-test
+    check:
+      - gate-cookbook-openstack-integration-test-chef-lint
+      - gate-cookbook-openstack-integration-test-chef-style
+      - gate-cookbook-openstack-integration-test-chef-unit
+    gate:
+      - gate-cookbook-openstack-integration-test-chef-lint
+      - gate-cookbook-openstack-integration-test-chef-unit
+
   - name: stackforge/designate
     check:
       - gate-designate-pep8