From 84c63ff1bfe888cead60d30ecdcd7000aea97247 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Thu, 3 Jun 2021 17:50:23 +0000
Subject: [PATCH] Forward openstack-security ML to openstack-discuss
The openstack-security mailing list is officially closing, and wants
future attempts at posting to end up on openstack-discuss instead:
http://lists.openstack.org/pipermail/openstack-security/2021-June/006077.html
This was also the only remaining user of the notify-impact Gerrit
hook, so we can stop installing/running it.
Change-Id: Id60b781beb072366673b32326e32fd79637c1219
---
doc/source/jeepyb.rst | 10 ----------
inventory/service/host_vars/lists.openstack.org.yaml | 2 +-
playbooks/roles/gerrit/files/hooks/patchset-created | 1 -
playbooks/roles/gerrit/tasks/main.yaml | 9 ---------
4 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/doc/source/jeepyb.rst b/doc/source/jeepyb.rst
index 6ae6b4c363..8099c01311 100644
--- a/doc/source/jeepyb.rst
+++ b/doc/source/jeepyb.rst
@@ -131,16 +131,6 @@ commit hook so that it runs each time a patchset is created. It
updates Launchpad blueprints based on information that it finds in the
commit message.
-Impact Notification
--------------------
-
-The ``notify-impact`` commit hook runs when new patchsets are created
-and sends email notifications when certain regular expressions are
-matched, such as:
-
-* DocImpact
-* SecurityImpact
-
Trivial Rebase Hook
-------------------
diff --git a/inventory/service/host_vars/lists.openstack.org.yaml b/inventory/service/host_vars/lists.openstack.org.yaml
index 40cde31870..1bae5b26f3 100644
--- a/inventory/service/host_vars/lists.openstack.org.yaml
+++ b/inventory/service/host_vars/lists.openstack.org.yaml
@@ -8,6 +8,7 @@ exim_aliases:
openstack-dev: openstack-discuss
openstack-infra: openstack-discuss
openstack-operators: openstack-discuss
+ openstack-security: openstack-discuss
openstack-sigs: openstack-discuss
openstack-tc: openstack-discuss
user-committee: openstack-discuss
@@ -28,7 +29,6 @@ exim_aliases:
openstack-infra-owner: spam
openstack-ko-owner: spam
openstack-qa-owner: spam
- openstack-security-owner: spam
openstack-vi-owner: spam
product-wg-owner: spam
superuser-owner: spam
diff --git a/playbooks/roles/gerrit/files/hooks/patchset-created b/playbooks/roles/gerrit/files/hooks/patchset-created
index e6c93f8790..c5392485f2 100755
--- a/playbooks/roles/gerrit/files/hooks/patchset-created
+++ b/playbooks/roles/gerrit/files/hooks/patchset-created
@@ -8,7 +8,6 @@ export PROJECTS_INI=/var/gerrit/etc/projects.ini
# Use timeout to kill any process running longer than 10 minutes.
timeout -k 2m 10m /usr/local/bin/update-bug patchset-created "$@"
-timeout -k 2m 10m /usr/local/bin/notify-impact patchset-created "$@" --impact SecurityImpact --dest-address 'openstack-security@lists.openstack.org'
# TODO: reenable these once jeepyb no longer relies on the old Gerrit DB
#timeout -k 2m 10m /usr/local/bin/update-blueprint patchset-created "$@"
#if [ -f /var/gerrit/etc/ssh_welcome_rsa_key ] ; then
diff --git a/playbooks/roles/gerrit/tasks/main.yaml b/playbooks/roles/gerrit/tasks/main.yaml
index 2241539ebd..54fc9c0524 100644
--- a/playbooks/roles/gerrit/tasks/main.yaml
+++ b/playbooks/roles/gerrit/tasks/main.yaml
@@ -206,15 +206,6 @@
- change-abandoned
- patchset-created
-- name: Copy notify-impact yaml file
- copy:
- src: "/opt/project-config/gerrit/notify_impact.yaml"
- dest: "{{ gerrit_site_dir }}/hooks/notify_impact.yaml"
- remote_src: yes
- owner: "{{ gerrit_user_name }}"
- group: "{{ gerrit_user_name }}"
- mode: 0444
-
# TODO(mordred) These things should really go into the image instead.
- name: Copy static and etc
copy: