summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2019-02-15 13:43:23 -0800
committerJames E. Blair <jeblair@redhat.com>2019-02-15 13:43:23 -0800
commite6b1d2aa06d1f9a52a6588396a3b180e39f7ea2c (patch)
treef51d0b6ddda0c26d242eb1a4650211d6bb9fc053
parent404ff1d97b1335f42207ca37521ade629ceaf1d6 (diff)
Correct host variable in push-to-intermediate-registry
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 15 Feb 2019 22:31:38 +0000 Reviewed-on: https://review.openstack.org/637310 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/push-to-intermediate-registry/tasks/push.yaml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/push-to-intermediate-registry/tasks/push.yaml b/roles/push-to-intermediate-registry/tasks/push.yaml
index 0d21d45..f878fd7 100644
--- a/roles/push-to-intermediate-registry/tasks/push.yaml
+++ b/roles/push-to-intermediate-registry/tasks/push.yaml
@@ -4,7 +4,7 @@
4 --src-creds={{ buildset_registry.username }}:{{ buildset_registry.password }} 4 --src-creds={{ buildset_registry.username }}:{{ buildset_registry.password }}
5 --dest-creds={{ intermediate_registry.username }}:{{ intermediate_registry.password }} 5 --dest-creds={{ intermediate_registry.username }}:{{ intermediate_registry.password }}
6 docker://{{ buildset_registry.host }}:{{ buildset_registry.port }}/{{ image.repository }}:{{ image_tag }} 6 docker://{{ buildset_registry.host }}:{{ buildset_registry.port }}/{{ image.repository }}:{{ image_tag }}
7 docker://{{ intermediate_registry.hostname }}:{{ intermediate_registry.port}}/{{ image.repository }}:{{ zuul.build }}_{{ image_tag}} 7 docker://{{ intermediate_registry.host }}:{{ intermediate_registry.port}}/{{ image.repository }}:{{ zuul.build }}_{{ image_tag}}
8 loop: "{{ image.tags | default(['latest']) }}" 8 loop: "{{ image.tags | default(['latest']) }}"
9 loop_control: 9 loop_control:
10 loop_var: image_tag 10 loop_var: image_tag
@@ -16,7 +16,7 @@
16 zuul: 16 zuul:
17 artifacts: 17 artifacts:
18 "image_{{ image.repository }}:{{ image_tag }}": 18 "image_{{ image.repository }}:{{ image_tag }}":
19 url: "docker://{{ intermediate_registry.hostname }}:{{ intermediate_registry.port}}/{{ image.repository }}:{{ zuul.build }}_{{ image_tag}}" 19 url: "docker://{{ intermediate_registry.host }}:{{ intermediate_registry.port}}/{{ image.repository }}:{{ zuul.build }}_{{ image_tag}}"
20 metadata: 20 metadata:
21 type: container_image 21 type: container_image
22 repository: "{{ image.repository }}" 22 repository: "{{ image.repository }}"