From d0d13566a09e502a45afc9afb6e2f5f70fa77523 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 25 Mar 2020 15:49:14 -0500 Subject: [PATCH] Base run jobs needing containers on containers base We have a new base job, system-config-run-containers, that does what is needed to ensure images are pulled from the intermediate registry when appropriate. Also remove opendev-buildset-registry from jobs that neither build nor consume images from this tenant. Change-Id: I5de4a1ddbf336749160a3ef996b6b3f55bc46666 --- .zuul.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index a05a29d187..9a7b55c658 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1189,7 +1189,6 @@ parent: system-config-run description: | Run the playbook for the docker registry. - dependencies: opendev-buildset-registry nodeset: nodes: - name: bridge.openstack.org @@ -1216,7 +1215,7 @@ - job: name: system-config-run-gitea - parent: system-config-run + parent: system-config-run-containers description: | Run the playbook for the gitea servers. timeout: 3600 @@ -1305,7 +1304,6 @@ parent: system-config-run description: | Run the playbook for the docker registry. - dependencies: opendev-buildset-registry nodeset: nodes: - name: bridge.openstack.org @@ -1322,7 +1320,7 @@ - job: name: system-config-run-review - parent: system-config-run + parent: system-config-run-containers description: | Run the playbook for gerrit (in a container). requires: gerrit-2.13-container-image