mirror of
https://github.com/containers/ansible-podman-collections.git
synced 2026-02-03 23:01:48 +00:00
Fix list tags failure in podman_search (#875)
Fix #874 Signed-off-by: Sagi Shnaidman <sshnaidm@redhat.com>
This commit is contained in:
parent
4c84135f5d
commit
a77ca6ab85
2 changed files with 18 additions and 4 deletions
|
|
@ -87,10 +87,11 @@ def search_images(module, executable, term, limit, list_tags):
|
||||||
command.extend(['--list-tags'])
|
command.extend(['--list-tags'])
|
||||||
|
|
||||||
rc, out, err = module.run_command(command)
|
rc, out, err = module.run_command(command)
|
||||||
|
if rc != 0 and list_tags and out == "" and "fetching tags list" in err:
|
||||||
|
return out, err
|
||||||
if rc != 0:
|
if rc != 0:
|
||||||
module.fail_json(msg="Unable to gather info for '{0}': {1}".format(term, err))
|
module.fail_json(msg="Unable to gather info for '{0}': {1}".format(term, err))
|
||||||
return out
|
return out, err
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
@ -110,7 +111,7 @@ def main():
|
||||||
list_tags = module.params.get('list_tags')
|
list_tags = module.params.get('list_tags')
|
||||||
executable = module.get_bin_path(executable, required=True)
|
executable = module.get_bin_path(executable, required=True)
|
||||||
|
|
||||||
result_str = search_images(module, executable, term, limit, list_tags)
|
result_str, errors = search_images(module, executable, term, limit, list_tags)
|
||||||
if result_str == "":
|
if result_str == "":
|
||||||
results = []
|
results = []
|
||||||
else:
|
else:
|
||||||
|
|
@ -121,7 +122,8 @@ def main():
|
||||||
|
|
||||||
results = dict(
|
results = dict(
|
||||||
changed=False,
|
changed=False,
|
||||||
images=results
|
images=results,
|
||||||
|
stderr=errors,
|
||||||
)
|
)
|
||||||
|
|
||||||
module.exit_json(**results)
|
module.exit_json(**results)
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,18 @@
|
||||||
that:
|
that:
|
||||||
- info_0.images | length == 0
|
- info_0.images | length == 0
|
||||||
|
|
||||||
|
- name: Search for an invalid image with tags
|
||||||
|
containers.podman.podman_search:
|
||||||
|
term: registry.fedoraproject.org/invalidtermnope
|
||||||
|
executable: "{{ test_executable | default('podman') }}"
|
||||||
|
list_tags: true
|
||||||
|
register: info_0_1
|
||||||
|
|
||||||
|
- name: Check results for no matching images
|
||||||
|
assert:
|
||||||
|
that:
|
||||||
|
- info_0_1.images | length == 0
|
||||||
|
|
||||||
- name: Search for matching images
|
- name: Search for matching images
|
||||||
containers.podman.podman_search:
|
containers.podman.podman_search:
|
||||||
term: etcd
|
term: etcd
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue