From c2d46f424781d744369136a5ca7b0b8f405f796a Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Fri, 19 Mar 2021 10:33:09 -0700
Subject: [PATCH] Set up gitea image provides and requires for gating

This should ensure that if we have a parent job that updates the gitea
version and a do not merge child job that induces an artificial failure
for zuul hold purposes that we test the correct image in the child job's
changes.

Prior to this we were testing the existing published images, but
provides + requires will give the correct signaling to make the desired
"test new proposed image" behavior happen in the child change builds.

Change-Id: Ie6b827b650e0f32606dc5ec7f4aa0adfeebdeb5e
---
 zuul.d/docker-images/gitea.yaml   | 2 ++
 zuul.d/docker-images/haproxy.yaml | 2 ++
 zuul.d/system-config-run.yaml     | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/zuul.d/docker-images/gitea.yaml b/zuul.d/docker-images/gitea.yaml
index d4754ce95e..9e32a0ad3e 100644
--- a/zuul.d/docker-images/gitea.yaml
+++ b/zuul.d/docker-images/gitea.yaml
@@ -34,6 +34,7 @@
     name: system-config-build-image-gitea
     description: Build a gitea image.
     parent: system-config-build-image
+    provides: gitea-container-image
     vars: &gitea_vars
       docker_images:
         - context: docker/gitea
@@ -50,6 +51,7 @@
     name: system-config-upload-image-gitea
     description: Build and upload a gitea image.
     parent: system-config-upload-image
+    provides: gitea-container-image
     vars: *gitea_vars
     files: *gitea_files
 
diff --git a/zuul.d/docker-images/haproxy.yaml b/zuul.d/docker-images/haproxy.yaml
index 1d7c418a9a..bbdd95d4fd 100644
--- a/zuul.d/docker-images/haproxy.yaml
+++ b/zuul.d/docker-images/haproxy.yaml
@@ -4,6 +4,7 @@
     description: Build a haproxy-statsd image.
     parent: system-config-build-image
     requires: python-base-3.7-container-image
+    provides: haproxy-statsd-container-image
     vars: &haproxy-statsd_vars
       docker_images:
         - context: docker/haproxy-statsd
@@ -18,6 +19,7 @@
     description: Build and upload a haproxy-statsd image.
     parent: system-config-upload-image
     requires: python-base-3.7-container-image
+    provides: haproxy-statsd-container-image
     vars: *haproxy-statsd_vars
     files: *haproxy-statsd_files
 
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index 0dde030dfd..6f0ad39100 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -529,6 +529,9 @@
     required-projects:
       - openstack/project-config
       - opendev/system-config
+    requires:
+      - gitea-container-image
+      - haproxy-statsd-container-image
     vars:
       run_playbooks:
         - playbooks/letsencrypt.yaml