zuul/zuul-registry
Code Issues Proposed changes

Fix and/or matching for image pre-conditions

Browse Source 
These matches look like they should be "or" (if any of these images is
already there, fail), not "and".  This caused some confusion when the
image was being leaked (I722ba599fbc690d6cb967070c05215b98a73dcaf) as
this wasn't triggering.

Change-Id: Ic6dad7bbf9013e994eb80a54bc5191a96bd4be94
This commit is contained in:
Ian Wienand 2022-03-02 06:30:03 +11:00
parent 329f0a5195
commit 0601df0049
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/functional-test/docker-buildset.yaml
View File

@ -53,9 +53,9 @@
- name: Print list of images
command: docker image ls --all --digests --no-trunc
register: image_list
failed_when:
- "'test/image' in image_list.stdout"
- "'alpine' in image_list.stdout"
failed_when: >
('test/image' in image_list.stdout) or
('alpine' in image_list.stdout)
- name: Pull the image from the buildset registry
command: docker pull test/image

8
playbooks/functional-test/podman-buildset.yaml
View File

@ -50,10 +50,10 @@
- name: Print list of images
command: podman image ls --all --digests --no-trunc
register: image_list
failed_when:
- "'test/image' in image_list.stdout"
- "'test/quay-image' in image_list.stdout"
- "'alpine' in image_list.stdout"
failed_when: >
('test/image' in image_list.stdout) or
('test/quay-image' in image_list.stdout) or
('alpine' in image_list.stdout)
- name: Pull the shadowed docker image from the registry
command: podman pull test/image