Add a soft dependency between gitea build and run

When we run the run-gitea job, make sure that it runs *after*
the gitea image build job, if the build job ran at all.  If
it didn't, we don't need to worry about it.

This has to happen in the project pipeline config because the
job dependency is different in check and gate.

Change-Id: I7cb069a6cd40a4ae8d5cbcdf23e7686b301493a1
This commit is contained in:
James E. Blair 2019-03-08 10:18:13 -08:00
parent 7a94bd060e
commit a5f3c1cffe

View File

@ -131,6 +131,7 @@
- context: docker/gitea - context: docker/gitea
target: gitea-openssh target: gitea-openssh
repository: opendevorg/gitea-openssh repository: opendevorg/gitea-openssh
# Duplicate in the run-gitea job
files: &gitea_files files: &gitea_files
- docker/gitea/.* - docker/gitea/.*
@ -539,6 +540,9 @@
- playbooks/roles/haproxy/ - playbooks/roles/haproxy/
- testinfra/test_gitea.py - testinfra/test_gitea.py
- testinfra/test_gitea_lb.py - testinfra/test_gitea_lb.py
# From gitea_files -- If we rebuild the image, we want to run
# this job as well.
- docker/gitea/.*
- job: - job:
name: system-config-run-zuul-preview name: system-config-run-zuul-preview
@ -607,7 +611,10 @@
- system-config-run-nodepool - system-config-run-nodepool
- system-config-run-docker - system-config-run-docker
- system-config-run-docker-registry - system-config-run-docker-registry
- system-config-run-gitea - system-config-run-gitea:
dependencies:
- name: system-config-build-image-gitea
soft: true
- system-config-run-zuul-preview - system-config-run-zuul-preview
- system-config-build-image-jinja-init - system-config-build-image-jinja-init
- system-config-build-image-gitea-init - system-config-build-image-gitea-init
@ -629,7 +636,10 @@
- system-config-run-nodepool - system-config-run-nodepool
- system-config-run-docker - system-config-run-docker
- system-config-run-docker-registry - system-config-run-docker-registry
- system-config-run-gitea - system-config-run-gitea:
dependencies:
- name: system-config-upload-image-gitea
soft: true
- system-config-run-zuul-preview - system-config-run-zuul-preview
- system-config-upload-image-jinja-init - system-config-upload-image-jinja-init
- system-config-upload-image-gitea-init - system-config-upload-image-gitea-init