summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@redhat.com>2019-02-15 17:46:42 -0800
committerJames E. Blair <jeblair@redhat.com>2019-02-15 17:46:42 -0800
commitee1b1ea2e4df9f5fa18d679b5a1c184f3c7f0bc4 (patch)
tree9c84c56ba2b1520ebef9ed046e9671f03bee3914
parentc7818fe499d3eb4d3c603b77647d6894b30d0368 (diff)
Intermediate registry: correct arg order
The --insecure-policy argument must appear before copy. Change-Id: If182405b57c026ced237bf152d323bdea6ff54b2
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: Sat, 16 Feb 2019 02:25:06 +0000 Reviewed-on: https://review.openstack.org/637342 Project: openstack-infra/zuul-jobs Branch: refs/heads/master
-rw-r--r--roles/pull-from-intermediate-registry/tasks/main.yaml2
-rw-r--r--roles/push-to-intermediate-registry/tasks/push.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/pull-from-intermediate-registry/tasks/main.yaml b/roles/pull-from-intermediate-registry/tasks/main.yaml
index 06979d6..e5591ad 100644
--- a/roles/pull-from-intermediate-registry/tasks/main.yaml
+++ b/roles/pull-from-intermediate-registry/tasks/main.yaml
@@ -1,6 +1,6 @@
1- name: Pull artifact from intermediate registry 1- name: Pull artifact from intermediate registry
2 command: >- 2 command: >-
3 skopeo copy --insecure-policy 3 skopeo --insecure-policy copy
4 --src-creds={{ intermediate_registry.username }}:{{ intermediate_registry.password }} 4 --src-creds={{ intermediate_registry.username }}:{{ intermediate_registry.password }}
5 --dest-creds={{ buildset_registry.username }}:{{ buildset_registry.password }} 5 --dest-creds={{ buildset_registry.username }}:{{ buildset_registry.password }}
6 {{ item.url }} 6 {{ item.url }}
diff --git a/roles/push-to-intermediate-registry/tasks/push.yaml b/roles/push-to-intermediate-registry/tasks/push.yaml
index 7876748..94038fc 100644
--- a/roles/push-to-intermediate-registry/tasks/push.yaml
+++ b/roles/push-to-intermediate-registry/tasks/push.yaml
@@ -1,6 +1,6 @@
1- name: Push tag to intermediate registry 1- name: Push tag to intermediate registry
2 command: >- 2 command: >-
3 skopeo copy --insecure-policy 3 skopeo --insecure-policy copy
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 }}