From cdbfe6b97e4c86f3943008c4ac3feb3265888d28 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Fri, 20 Aug 2021 14:44:44 -0700
Subject: [PATCH] Move #zuul from OFTC to Matrix

Zuul is moving to an unbridged Matrix room.  Remove eavesdrop from
the OFTC room, and add the Matrix room to the two new Matrix bots.

Change-Id: I9bf34c1f67c6dac41c3761f8ccde4d7fa76bbf89
---
 inventory/service/group_vars/eavesdrop.yaml   |  2 --
 .../matrix-eavesdrop/templates/config.yaml    |  2 ++
 .../matrix-gerritbot/files/gerritbot.yaml     | 25 ++++++++++++++-----
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/inventory/service/group_vars/eavesdrop.yaml b/inventory/service/group_vars/eavesdrop.yaml
index c3b558a47c..e9b1805b97 100644
--- a/inventory/service/group_vars/eavesdrop.yaml
+++ b/inventory/service/group_vars/eavesdrop.yaml
@@ -95,7 +95,6 @@ limnoria_oftc_channels:
   - '#storyboard'
   - '#tacker'
   - '#tripleo'
-  - '#zuul'
 statusbot_channels:
   - airshipit
   - edge-computing-group
@@ -179,7 +178,6 @@ statusbot_channels:
   - syscompass
   - tacker
   - tripleo
-  - zuul
 statusbot_auth_nicks:
   - jeblair
   - corvus
diff --git a/playbooks/roles/matrix-eavesdrop/templates/config.yaml b/playbooks/roles/matrix-eavesdrop/templates/config.yaml
index 51884815b4..4fc0b5d8ec 100644
--- a/playbooks/roles/matrix-eavesdrop/templates/config.yaml
+++ b/playbooks/roles/matrix-eavesdrop/templates/config.yaml
@@ -11,3 +11,5 @@ config:
 rooms:
   - id: "#test:opendev.org"
     path: "#test"
+  - id: "#zuul:opendev.org"
+    path: "#zuul"
diff --git a/playbooks/roles/matrix-gerritbot/files/gerritbot.yaml b/playbooks/roles/matrix-gerritbot/files/gerritbot.yaml
index 0a2421aae6..254596931f 100644
--- a/playbooks/roles/matrix-gerritbot/files/gerritbot.yaml
+++ b/playbooks/roles/matrix-gerritbot/files/gerritbot.yaml
@@ -1,11 +1,24 @@
 - room: '#test:opendev.org'
   branches:
-  - master
+    - master
   servers:
-  - review.opendev.org
+    - review.opendev.org
   events:
-  - PatchsetCreated
-  - ChangeMerged
+    - PatchsetCreated
+    - ChangeMerged
   projects:
-  - zuul/*
-  - opendev/*
+    - zuul/*
+    - opendev/*
+
+- room: '#zuul:opendev.org'
+  branches:
+    - master
+  servers:
+    - review.opendev.org
+  events:
+    - PatchsetCreated
+    - ChangeMerged
+  projects:
+    - zuul/*
+    - opendev/zone-zuul-ci.org
+    - opendev/zone-gating.dev