From 7e7f1a414a389512f1bde5d5dc057ebb490a6a0f Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Sat, 21 Mar 2020 09:40:07 -0500
Subject: [PATCH] Add opendev-buildset-registry depends where overridden

Job dependencies are overrides, not additions, so in the case of
several jobs that have the opendev-buildset-registry job in their
depends via parent jobs but express a dependency in the pipeline
config, the dependency on opendev-buildset-registry was not there.
Add mention in the pipeline config. Remove it from the
system-config-run-gitea job definition because we're defining it
in the pipeline and it could lead to confusion.

Change-Id: I4a115a3c547b7feb34d1552278ae25337c2ae371
---
 .zuul.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index fd48964efa..a763b490e7 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1000,7 +1000,6 @@
     parent: system-config-run
     description: |
       Run the playbook for the gitea servers.
-    dependencies: opendev-buildset-registry
     timeout: 3600
     nodeset:
       nodes:
@@ -1305,6 +1304,7 @@
         - system-config-run-docker-registry
         - system-config-run-gitea:
             dependencies:
+              - name: opendev-buildset-registry
               - name: system-config-build-image-gitea
                 soft: true
               - name: system-config-build-image-haproxy-statsd
@@ -1318,10 +1318,12 @@
         - system-config-run-letsencrypt
         - system-config-build-image-jinja-init:
             dependencies:
+              - name: opendev-buildset-registry
               - name: system-config-build-image-python-base
                 soft: true
         - system-config-build-image-gitea-init:
             dependencies:
+              - name: opendev-buildset-registry
               - name: system-config-build-image-jinja-init
                 soft: true
         - system-config-build-image-gitea
@@ -1360,6 +1362,7 @@
                 soft: true
         - system-config-build-image-haproxy-statsd:
             dependencies:
+              - name: opendev-buildset-registry
               - name: system-config-build-image-python-base
                 soft: true
         - system-config-build-image-python-base
@@ -1385,6 +1388,7 @@
         - system-config-run-docker-registry
         - system-config-run-gitea:
             dependencies:
+              - name: opendev-buildset-registry
               - name: system-config-upload-image-gitea
                 soft: true
               - name: system-config-upload-image-haproxy-statsd
@@ -1398,10 +1402,12 @@
         - system-config-run-letsencrypt
         - system-config-upload-image-jinja-init:
             dependencies:
+              - name: opendev-buildset-registry
               - name: system-config-upload-image-python-base
                 soft: true
         - system-config-upload-image-gitea-init:
             dependencies:
+              - name: opendev-buildset-registry
               - name: system-config-upload-image-jinja-init
                 soft: true
         - system-config-upload-image-gitea
@@ -1434,6 +1440,7 @@
                 soft: true
         - system-config-upload-image-haproxy-statsd:
             dependencies:
+              - name: opendev-buildset-registry
               - name: system-config-upload-image-python-base
                 soft: true
         - system-config-upload-image-python-base