From 944b78154d5272e9bc9bd6a9d9cc12d1a3fbd9bb Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Sun, 15 Oct 2023 19:52:01 -0700
Subject: [PATCH] Fix the relevant files lists for lists3 jobs

Fix the infra-prod-service-lists3 job to trigger when we update the
mailman3.yaml group vars file. In addition we make a noop reorganization
change to the mailman3 group file to group exim vars together which will
be used to ensure that this change triggers the lists3 job as expected.

In system-config-run-lists3 we update that job to be triggered when we
update the docker images for mailman. We don't bother testing this now
as that would be masked off by the update to the mailman3 groups file.
But in the future when we do mailman3 image updates we'll be looking for
this job to run.

Change-Id: I994b0a79bf46f525dd9e059719f5a08c9c390b8c
---
 inventory/service/group_vars/mailman3.yaml | 8 ++++----
 zuul.d/infra-prod.yaml                     | 1 +
 zuul.d/system-config-run.yaml              | 1 +
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/inventory/service/group_vars/mailman3.yaml b/inventory/service/group_vars/mailman3.yaml
index 1288482341..a16e972075 100644
--- a/inventory/service/group_vars/mailman3.yaml
+++ b/inventory/service/group_vars/mailman3.yaml
@@ -1,7 +1,3 @@
-exim_queue_interval: '1m'
-exim_queue_run_max: '50'
-exim_smtp_accept_max: '100'
-exim_smtp_accept_max_per_host: '10'
 iptables_extra_public_tcp_ports:
   - 25
   - 80
@@ -24,6 +20,10 @@ borg_backup_excludes_extra:
   - /var/backups/mailman-mariadb
   # Can regenerate indexes from source email files
   - /var/lib/mailman/web-data/fulltext_index
+exim_queue_interval: '1m'
+exim_queue_run_max: '50'
+exim_smtp_accept_max: '100'
+exim_smtp_accept_max_per_host: '10'
 exim_routers:
   - mailman_verp_router: |
       {% raw -%}
diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index fbd5785149..e8b6b2cc5d 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -585,6 +585,7 @@
       - docker/mailman
       - inventory/base
       - inventory/service/host_vars/lists01.opendev.org.yaml
+      - inventory/service/group_vars/mailman3.yaml
       - playbooks/roles/iptables/
       - playbooks/roles/base/exim
       - playbooks/roles/mailman3/
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 1bb56bdb20..ec90f4b8cc 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -338,6 +338,7 @@
     required-projects:
       - opendev/system-config
     files:
+      - docker/mailman
       - playbooks/bootstrap-bridge.yaml
       - inventory/service/host_vars/lists01.opendev.org.yaml
       - inventory/service/group_vars/mailman3.yaml