From f045fa0ab35aa4a4a63f1a33b8efd8f9f285abbb Mon Sep 17 00:00:00 2001 From: Michael Still Date: Wed, 20 Nov 2013 08:42:39 +1100 Subject: [PATCH] Add an initial subscriber map for notify_impact This only includes my team at the moment, but I will document how other teams can set this up soon. Change-Id: Ia8d47153e3eaf4ba3205723887dab41e334a4d6f --- modules/openstack_project/files/gerrit/change-merged | 2 +- .../files/gerrit/subscriber_map.yaml | 11 +++++++++++ modules/openstack_project/manifests/gerrit.pp | 7 +++++++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 modules/openstack_project/files/gerrit/subscriber_map.yaml diff --git a/modules/openstack_project/files/gerrit/change-merged b/modules/openstack_project/files/gerrit/change-merged index 7953512b77..343dcde741 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' +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 diff --git a/modules/openstack_project/files/gerrit/subscriber_map.yaml b/modules/openstack_project/files/gerrit/subscriber_map.yaml new file mode 100644 index 0000000000..992629d531 --- /dev/null +++ b/modules/openstack_project/files/gerrit/subscriber_map.yaml @@ -0,0 +1,11 @@ +author_map: + michael.still@rackspace.com: rcbau + mikal@stillhq.com: rcbau + joshua.hesketh@rackspace.com: rcbau + michael.davies@rackspace.com: rcbau + michael@the-davies.net: rcbau + lana.brindley@rackspace.com: rcbau + openstack@lanabrindley.com: rcbau + +subscriber_map: + rcbau: ['mikalstill', 'loquacity'] diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp index 4dc5a52597..922bf4532c 100644 --- a/modules/openstack_project/manifests/gerrit.pp +++ b/modules/openstack_project/manifests/gerrit.pp @@ -261,6 +261,13 @@ class openstack_project::gerrit ( require => Class['::gerrit'], } + file { '/home/gerrit2/review_site/hooks/subscriber_map.yaml': + ensure => present, + source => + 'puppet:///modules/openstack_project/gerrit/subscriber_map.yaml', + require => Class['::gerrit'], + } + file { '/home/gerrit2/review_site/hooks/patchset-created': ensure => present, owner => 'root',