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
This commit is contained in:
Monty Taylor 2020-03-21 09:40:07 -05:00
parent 8c7b94436b
commit 7e7f1a414a

View File

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