summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2019-02-18 15:32:17 -0800
committerJames E. Blair <jeblair@redhat.com>2019-02-18 15:32:17 -0800
commit8567dddf9788dad9aa0f4b23b483bdd8ae7c219b (patch)
treed50d5cd932babe5d04ca27296f14ce979645ccf1
parentc58e2a51dcd733277b715943c6740d3fe6fc877c (diff)
Fix build-docker-image when using buildset_registry
This was incorrect ansible -- we need to run two commands here, so let's just do it as two tasks. Change-Id: I88c6382f7f41659217ae66f07d6e5d9db0bf3b38
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: James E. Blair <corvus@inaugust.com> Workflow+1: James E. Blair <corvus@inaugust.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 19 Feb 2019 00:25:13 +0000 Reviewed-on: https://review.openstack.org/637650 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/build-docker-image/tasks/push.yaml7
1 files changed, 6 insertions, 1 deletions
diff --git a/roles/build-docker-image/tasks/push.yaml b/roles/build-docker-image/tasks/push.yaml
index ed41714..d49edd1 100644
--- a/roles/build-docker-image/tasks/push.yaml
+++ b/roles/build-docker-image/tasks/push.yaml
@@ -1,6 +1,11 @@
1- name: Push tag to buildset registry 1- name: Tag image for buildset registry
2 command: >- 2 command: >-
3 docker tag {{ image.repository }}:{{ image_tag }} {{ buildset_registry.host }}:{{ buildset_registry.port }}/{{ image.repository }}:{{ image_tag }} 3 docker tag {{ image.repository }}:{{ image_tag }} {{ buildset_registry.host }}:{{ buildset_registry.port }}/{{ image.repository }}:{{ image_tag }}
4 loop: "{{ image.tags | default(['latest']) }}"
5 loop_control:
6 loop_var: image_tag
7- name: Push tag to buildset registry
8 command: >-
4 docker push {{ buildset_registry.host }}:{{ buildset_registry.port }}/{{ image.repository }}:{{ image_tag }} 9 docker push {{ buildset_registry.host }}:{{ buildset_registry.port }}/{{ image.repository }}:{{ image_tag }}
5 loop: "{{ image.tags | default(['latest']) }}" 10 loop: "{{ image.tags | default(['latest']) }}"
6 loop_control: 11 loop_control: