From 8cc8a834f1ff414c581ef8ad047057f0c72f5e05 Mon Sep 17 00:00:00 2001 From: Michael Still Date: Sat, 14 Dec 2013 07:39:38 +1100 Subject: [PATCH] Add project configuration. Add a mapping of gerrit projects to the right place to create DocImpact bugs. Change-Id: Ic64e911b3e095dcd06b726f584a2b389e30ee24b --- .../files/gerrit/change-merged | 2 +- ...subscriber_map.yaml => notify_impact.yaml} | 10 +++--- .../files/review.projects.yaml | 33 +++++++++++++++++++ modules/openstack_project/manifests/gerrit.pp | 4 +-- 4 files changed, 42 insertions(+), 7 deletions(-) rename modules/openstack_project/files/gerrit/{subscriber_map.yaml => notify_impact.yaml} (81%) diff --git a/modules/openstack_project/files/gerrit/change-merged b/modules/openstack_project/files/gerrit/change-merged index 343dcde741..d04887ee37 100755 --- a/modules/openstack_project/files/gerrit/change-merged +++ b/modules/openstack_project/files/gerrit/change-merged @@ -2,4 +2,4 @@ # Use timeout to kill any process running longer than 10 minutes. timeout -k 2m 10m /usr/local/bin/update-bug change-merged "$@" -timeout -k 2m 10m /usr/local/bin/notify-impact change-merged "$@" --impact DocImpact --dest-address 'openstack-docs@lists.openstack.org' --auto-subscribers /home/gerrit2/review_site/hooks/subscriber_map.yaml +timeout -k 2m 10m /usr/local/bin/notify-impact change-merged "$@" --impact DocImpact --dest-address 'openstack-docs@lists.openstack.org' --config /home/gerrit2/review_site/hooks/notify_impact.yaml diff --git a/modules/openstack_project/files/gerrit/subscriber_map.yaml b/modules/openstack_project/files/gerrit/notify_impact.yaml similarity index 81% rename from modules/openstack_project/files/gerrit/subscriber_map.yaml rename to modules/openstack_project/files/gerrit/notify_impact.yaml index fb4fc51b1d..2f7f47e40c 100644 --- a/modules/openstack_project/files/gerrit/subscriber_map.yaml +++ b/modules/openstack_project/files/gerrit/notify_impact.yaml @@ -1,11 +1,13 @@ -# This file is used by the notify_impact jeepyb plugin to add subscribers to -# automatically created DocImpact bugs. There are two structures here. The +# This file is used by the notify_impact jeepyb plugin to control the bugs it +# create. +# +# Please keep these structures in alphabetical order. + +# For automatically created DocImpact bugs, there are two structures here. The # author_map maps email addresses of authors to "groups". These groups can be # anything you want, although the most likely example is a dev team at a # particular company. The second structure is "subscriber_map", which lists # the people to subscribe to a bug owned by a particular group. -# -# Please keep these structures in alphabetical order. author_map: joshua.hesketh@rackspace.com: rcbau diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index 6767b13884..416b6ee9da 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -159,6 +159,7 @@ group: openstack-api-site - project: openstack/ceilometer - project: openstack/cinder + docimpact-group: openstack-manuals - project: openstack/compute-api group: openstack-api-site - project: openstack/database-api @@ -174,6 +175,7 @@ description: Common scheduler for OpenStack. upstream: git://github.com/n0ano/gantt.git - project: openstack/glance + docimpact-group: openstack-manuals - project: openstack/governance description: Openstack Technical Committee Decisions - project: openstack/heat @@ -181,6 +183,7 @@ upstream: git://github.com/heat-api/heat-cfntools.git - project: openstack/heat-templates - project: openstack/horizon + docimpact-group: openstack-manuals - project: openstack/identity-api group: openstack-api-site - project: openstack/image-api @@ -189,11 +192,14 @@ description: A service for managing and provisioning Bare Metal servers. upstream: git://github.com/devananda/ironic.git - project: openstack/keystone + docimpact-group: openstack-manuals - project: openstack/marconi - project: openstack/netconn-api group: openstack-api-site - project: openstack/neutron + docimpact-group: openstack-manuals - project: openstack/nova + docimpact-group: openstack-manuals - project: openstack/object-api group: openstack-api-site - project: openstack/openstack @@ -219,36 +225,47 @@ description: Restart services and coordinate data migration on Heat config changes. - project: openstack/oslo-incubator group: oslo + docimpact-group: openstack-manuals description: Part of OpenStack's Oslo project. New Oslo APIs go through an incubation phase in this repository before being released as part of a proper Python library. - project: openstack/oslo.config + docimpact-group: openstack-manuals - project: openstack/oslo.messaging + docimpact-group: openstack-manuals upstream: git://github.com/markmc/oslo.messaging.git - project: openstack/oslo.rootwrap + docimpact-group: openstack-manuals upstream: git://github.com/ttx/oslo.rootwrap.git - project: openstack/oslo.sphinx + docimpact-group: openstack-manuals description: Theme and utilities for Sphinx documentation tool - project: openstack/oslo.version + docimpact-group: openstack-manuals upstream: git://github.com/emonty/oslo.version.git - project: openstack/python-ceilometerclient upstream: git://github.com/asalkeld/python-ceilometerclient.git - project: openstack/python-cinderclient + docimpact-group: openstack-manuals - project: openstack/python-ganttclient description: Client code for the common scheduler for OpenStack. acl-config: /home/gerrit2/acls/openstack/gantt.config upstream: git://github.com/n0ano/ganttclient.git - project: openstack/python-glanceclient + docimpact-group: openstack-manuals - project: openstack/python-heatclient - project: openstack/python-ironicclient description: A python client implementing the Ironic API. - project: openstack/python-keystoneclient - project: openstack/python-marconiclient - project: openstack/python-neutronclient + docimpact-group: openstack-manuals - project: openstack/python-novaclient + docimpact-group: openstack-manuals - project: openstack/python-openstackclient - project: openstack/python-savannaclient description: Python bindings and CLI to Savanna. acl-config: /home/gerrit2/acls/openstack/savanna.config - project: openstack/python-swiftclient + docimpact-group: openstack-manuals - project: openstack/python-troveclient - project: openstack/python-tuskarclient description: Python bindings and CLI to Tuskar. @@ -270,6 +287,7 @@ description: Disk image elements for Savanna acl-config: /home/gerrit2/acls/openstack/savanna.config - project: openstack/swift + docimpact-group: openstack-manuals - project: openstack/swift-bench description: Benchmarking tool for OpenStack Swift upstream: git://github.com/jeblair/swift-bench.git @@ -358,60 +376,70 @@ acl-config: /home/gerrit2/acls/stackforge/congress.config - project: stackforge/cookbook-openstack-block-storage group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - OpenStack Block Storage acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: - direct-release - project: stackforge/cookbook-openstack-common group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - common OpenStack configuration acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: - direct-release - project: stackforge/cookbook-openstack-compute group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - OpenStack Compute acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: - direct-release - project: stackforge/cookbook-openstack-dashboard group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - OpenStack Dashboard acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: - direct-release - project: stackforge/cookbook-openstack-identity group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - OpenStack Identity acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: - direct-release - project: stackforge/cookbook-openstack-image group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - OpenStack Image acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: - direct-release - project: stackforge/cookbook-openstack-metering group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - OpenStack Metering acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: - direct-release - project: stackforge/cookbook-openstack-network group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - OpenStack Network acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: - direct-release - project: stackforge/cookbook-openstack-object-storage group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - OpenStack Object Storage acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: - direct-release - project: stackforge/cookbook-openstack-ops-database group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - Support Cookbook for Database acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config upstream: git://github.com/mattray/cookbook-openstack-ops-database.git @@ -419,6 +447,7 @@ - direct-release - project: stackforge/cookbook-openstack-ops-messaging group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - Support Cookbook for Messaging acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config upstream: git://github.com/mattray/cookbook-openstack-ops-messaging.git @@ -426,6 +455,7 @@ - direct-release - project: stackforge/cookbook-openstack-orchestration group: openstack-chef + docimpact-group: openstack-chef description: Chef Cookbook - OpenStack Orchestration acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: @@ -557,6 +587,7 @@ description: Common Automation Framework Engine. Core driver for CloudCAFE - project: stackforge/openstack-chef-repo group: openstack-chef + docimpact-group: openstack-chef description: Example Chef Repo that sets up an OpenStack Deployment acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config options: @@ -715,6 +746,8 @@ - project: stackforge/tooz description: Coordinate distributed systems. - project: stackforge/turbo-hipster + group: turbo-hipster + docimpact-group: turbo-hipster description: A generic zuul worker using the gearman protocol. upstream: git://github.com/rcbau/turbo-hipster.git - project: stackforge/wsme diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index 5ab9d31756..7da82b7352 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -275,10 +275,10 @@ class openstack_project::gerrit ( require => Class['::gerrit'], } - file { '/home/gerrit2/review_site/hooks/subscriber_map.yaml': + file { '/home/gerrit2/review_site/hooks/notify_impact.yaml': ensure => present, source => - 'puppet:///modules/openstack_project/gerrit/subscriber_map.yaml', + 'puppet:///modules/openstack_project/gerrit/notify_impact.yaml', require => Class['::gerrit'], }