From a5f3c1cffe02e02cc22dee5578814027eaa6bbee Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 8 Mar 2019 10:18:13 -0800 Subject: [PATCH] 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 --- .zuul.yaml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index aae538fa0f..92030e5f46 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -131,6 +131,7 @@ - context: docker/gitea target: gitea-openssh repository: opendevorg/gitea-openssh + # Duplicate in the run-gitea job files: &gitea_files - docker/gitea/.* @@ -539,6 +540,9 @@ - playbooks/roles/haproxy/ - testinfra/test_gitea.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: name: system-config-run-zuul-preview @@ -607,7 +611,10 @@ - system-config-run-nodepool - system-config-run-docker - 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-build-image-jinja-init - system-config-build-image-gitea-init @@ -629,7 +636,10 @@ - system-config-run-nodepool - system-config-run-docker - 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-upload-image-jinja-init - system-config-upload-image-gitea-init