From 7a94bd060e70f221c1b1e2ad2ae1022c776f7398 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 8 Mar 2019 12:59:31 -0800 Subject: [PATCH] Use the opendev docker build jobs These now only run a registry if there isn't already one running in the buildset, so we can use them here in that configuration. They also take care of the provides/requires for us, so we can remove those. Change-Id: I3b6d825df8d658adcae51ed20a5335c612b7d9f2 Depends-On: https://review.openstack.org/642151 --- .zuul.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d1a5699e9e..aae538fa0f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -41,18 +41,14 @@ - job: name: system-config-build-image - parent: build-docker-image + parent: opendev-build-docker-image dependencies: opendev-buildset-registry - requires: docker-image - provides: docker-image abstract: true - job: name: system-config-upload-image - parent: upload-docker-image + parent: opendev-upload-docker-image dependencies: opendev-buildset-registry - requires: docker-image - provides: docker-image abstract: true secrets: name: docker_credentials @@ -61,7 +57,7 @@ - job: name: system-config-promote-image - parent: promote-docker-image + parent: opendev-promote-docker-image abstract: true secrets: name: docker_credentials @@ -550,7 +546,6 @@ description: | Run the playbook for the docker registry. dependencies: opendev-buildset-registry - requires: docker-image nodeset: nodes: - name: bridge.openstack.org