From 2abe17ecc8a91723ba1bb207e8e4e05539f5ad48 Mon Sep 17 00:00:00 2001 From: Alexander Hughes Date: Fri, 15 Jan 2021 12:24:21 -0500 Subject: [PATCH] Minor adjustment to publish images job The original implementation called a make target that does not exist leading to a post failure in Zuul as seen in [0]. This change updates the publish image job to leverage the build images job, followed by a docker push on the newly created images for nodelabeler and vino controller. [0] https://zuul.opendev.org/t/openstack/build/b7281e50666e4d56a1601691a0064a96 Signed-off-by: Alexander Hughes Change-Id: I0e289301db9481ed7f87996463f8a8548e2704df --- roles/vino-publish-images/tasks/main.yaml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/roles/vino-publish-images/tasks/main.yaml b/roles/vino-publish-images/tasks/main.yaml index c19d129..2bd8e36 100644 --- a/roles/vino-publish-images/tasks/main.yaml +++ b/roles/vino-publish-images/tasks/main.yaml @@ -36,26 +36,12 @@ password: "{{ airship_vino_airshipit_quay_secret.password }}" registry_url: "{{ image_repo }}" - - name: Push Image with Latest Tag + - name: Push controller image with latest tag make: chdir: "{{ zuul.project.src_dir }}" - params: - DOCKER_IMAGE_TAG: latest - PUBLISH: "true" - PROXY: "{{ proxy.http }}" - NO_PROXY: "{{ proxy.noproxy }}" - USE_PROXY: "{{ proxy.enabled | lower }}" - DOCKER_REGISTRY: "{{ image_repo }}" - target: images + target: docker-push-controller - - name: Push Image with Commit Tag + - name: Push nodelabeler image with latest tag make: chdir: "{{ zuul.project.src_dir }}" - params: - DOCKER_IMAGE_TAG: "{{ zuul.newrev }}" - PUBLISH: "true" - PROXY: "{{ proxy.http }}" - NO_PROXY: "{{ proxy.noproxy }}" - USE_PROXY: "{{ proxy.enabled | lower }}" - DOCKER_REGISTRY: "{{ image_repo }}" - target: images + target: docker-push-nodelabeler \ No newline at end of file