From a329454a14dc6093cf72b75f5d0ebdcb6e01368e Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 1 Jul 2021 17:34:53 +1000 Subject: [PATCH] Revert "Add opendev-intermediate-registry-base" This reverts commit 80b93d1f046ebfae8a588a2d8dba7e162bf7b150. I have actually now realised that this duplicates the existing job opendev-buildset-registry-consumer. Change-Id: I6c32ee24ab7982c19c82ca79ad2e9d2911056606 --- doc/source/docker-image.rst | 2 -- zuul.d/jobs.yaml | 36 ------------------------------------ 2 files changed, 38 deletions(-) diff --git a/doc/source/docker-image.rst b/doc/source/docker-image.rst index a617072..0ed67e8 100644 --- a/doc/source/docker-image.rst +++ b/doc/source/docker-image.rst @@ -156,8 +156,6 @@ the additional tasks performed by the "upload" and "promote" jobs: Jobs ---- -.. zuul:autojob:: opendev-intermediate-registry-base - .. zuul:autojob:: opendev-buildset-registry .. zuul:autojob:: opendev-buildset-registry-consumer diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index c5b1fde..b8edf13 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -141,42 +141,6 @@ +v5Gg5Wb07OWvBjg0jcL9IvNwQXgWh39y4uq4TmKcYXHL6RnICtN5Hp4Gc7xDxNvp2+uC Na/OOailVlvkWMcpO/l77/qFtNXoRxFTDWYqp5rE3fGmdq09hCiflFWgMMre08= -- job: - name: opendev-intermediate-registry-base - description: | - A base job that runs "pull-from-intermediate-registry" to - populate the current buildset registry with container artifacts - from the Opendev intermediate-registry. - - Use this in jobs that want to speculatively test (i.e. use - Depends-On:) containers from other projects that publish to the - Opendev intermediate registry. - - For example, project `moo` builds a container image. It should: - - * specify `provides: moo-container-image` for it's container - build job - * ensure it pre-runs the opendev-buildset-registry job - * use the opendev-build-docker-image jobs below to produce the - container - - Changes to `moo` will then push their container images to the - Opendev intermediate registry and provide an artifact in their - job result. - - If project `foo` then has a job that wishes to speculatively - test (via Depend-On:) the `moo` change by using the container it - has built, it should: - - * add `requires: moo-container-image` - * pre-run opendev-buildset-registry - * parent itself to this job. - - This will pull the `moo` container produced by the dependent - change from the intermediate archive into the running buildset - registry for deployment and testing. - pre-run: playbooks/docker-image/pre.yaml - - job: name: opendev-buildset-registry description: |