zuul/zuul-jobs
Code Issues Proposed changes

Add retries to skopeo copy operations

Browse Source 
We think that sometimes the network derps so the whole copy goes
bad. Add retries in to the mix since a copy command is idempotent.

Change-Id: I2d2891f2ebe3ca6a99874d9cf028addea888c3b7
This commit is contained in:
Monty Taylor 2019-04-25 17:19:25 +00:00
parent 9674e1d442
commit 454b5349b0
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/pull-from-intermediate-registry/tasks/main.yaml
View File

@ -74,6 +74,9 @@
skopeo --insecure-policy copy skopeo --insecure-policy copy
{{ item.url }} {{ item.url }}
docker://127.0.0.1:{{ socat_port }}/{{ item.metadata.repository }}:{{ item.metadata.tag }} docker://127.0.0.1:{{ socat_port }}/{{ item.metadata.repository }}:{{ item.metadata.tag }}
retries: 3
register: result
until: result is success
when: "'metadata' in item and item.metadata.type | default('') == 'container_image'" when: "'metadata' in item and item.metadata.type | default('') == 'container_image'"
loop: "{{ zuul.artifacts | default([]) }}" loop: "{{ zuul.artifacts | default([]) }}"
always: always:

3
roles/push-to-intermediate-registry/tasks/push-image.yaml
View File

@ -3,6 +3,9 @@
skopeo --insecure-policy copy skopeo --insecure-policy copy
docker://127.0.0.1:{{ socat_port }}/{{ image.repository }}:{{ image_tag }} docker://127.0.0.1:{{ socat_port }}/{{ image.repository }}:{{ image_tag }}
docker://{{ intermediate_registry.host | ipwrap }}:{{ intermediate_registry.port}}/{{ image.repository }}:{{ zuul.build }}_{{ image_tag }} docker://{{ intermediate_registry.host | ipwrap }}:{{ intermediate_registry.port}}/{{ image.repository }}:{{ zuul.build }}_{{ image_tag }}
retries: 3
register: result
until: result is success
loop: "{{ image.tags | default(['latest']) }}" loop: "{{ image.tags | default(['latest']) }}"
loop_control: loop_control:
loop_var: image_tag loop_var: image_tag