From 47d2e07d9406ef87df8f66e5da43f8be5b5c08f2 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 29 Nov 2023 09:59:30 -0800
Subject: [PATCH] Trigger gerrit image promotion when the gerrit image jobs
 update

We often need to update gerrit image build details that only live in the
job specification. For example tag or branch versions of gerrit and
related repos. When we do this if we don't also do a noop update to our
Dockerfiles the promotion job doesn't run for these images because we
can't do the implicit file match in the promotion (deploy) pipeline.

Fix this by explicitly matching the job config file in our jobs so that
when we update the gerrit jobs we also run the gerrit image promotion
jobs.

We also ensure the system-config-run-review and
infra-prod-service-review jobs are triggered when the docker image jobs
update. This ensures we actually test the resulting images and then
perform potentially necessary deployment actions before they are pulled
into use.

Change-Id: Id0c51818cd1e01bd16a79ab0c0f9172e844376b8
---
 zuul.d/docker-images/gerrit.yaml | 2 ++
 zuul.d/infra-prod.yaml           | 1 +
 zuul.d/system-config-run.yaml    | 1 +
 3 files changed, 4 insertions(+)

diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index 5966a31caa..aa49d31ee8 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -21,6 +21,7 @@
       - docker/gerrit/base/
       - roles/bazelisk-build/
       - playbooks/zuul/gerrit/
+      - zuul.d/docker-images/gerrit.yaml
 
 - job:
     name: system-config-upload-image-gerrit-base
@@ -112,6 +113,7 @@
       - testinfra/test_gerrit.py
       - jeepyb/
       - roles/bazelisk-build/
+      - zuul.d/docker-images/gerrit.yaml
 
 - job:
     name: system-config-upload-image-gerrit-3.8
diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml
index 251cd7ccf4..9f038c2a7f 100644
--- a/zuul.d/infra-prod.yaml
+++ b/zuul.d/infra-prod.yaml
@@ -425,6 +425,7 @@
       - playbooks/roles/install-docker/
       - playbooks/roles/iptables/
       - playbooks/roles/gerrit/
+      - zuul.d/docker-images/gerrit.yaml
 
 - job:
     name: infra-prod-service-refstack
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index f92f01e1b8..5eb47b5ba3 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -1074,6 +1074,7 @@
       - playbooks/zuul/bootstrap-test-review.yaml
       - playbooks/zuul/test-review.yaml
       - playbooks/zuul/upgrade-review.yaml
+      - zuul.d/docker-images/gerrit.yaml
 
 - job:
     name: system-config-run-review-3.8