Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ansible-runner for openSUSE:Factory checked in at 2024-03-17 22:15:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ansible-runner (Old) and /work/SRC/openSUSE:Factory/.ansible-runner.new.1905 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ansible-runner" Sun Mar 17 22:15:37 2024 rev:9 rq:1158502 version:2.3.6 Changes: -------- --- /work/SRC/openSUSE:Factory/ansible-runner/ansible-runner.changes 2024-03-09 20:55:26.636256699 +0100 +++ /work/SRC/openSUSE:Factory/.ansible-runner.new.1905/ansible-runner.changes 2024-03-17 22:16:16.176972694 +0100 @@ -1,0 +2,9 @@ +Sat Mar 16 14:25:23 UTC 2024 - Johannes Kastl <opensuse_buildserv...@ojkastl.de> + +- update to 2.3.6: + * Untag instead of force remove image for podman. This makes the + |worker cleanup| subcommand behave similarly with either docker + or podman. + (#1342 <https://github.com/ansible/ansible-runner/pull/1342>) + +------------------------------------------------------------------- Old: ---- ansible-runner-2.3.5.tar.gz New: ---- ansible-runner-2.3.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ansible-runner.spec ++++++ --- /var/tmp/diff_new_pack.iwWuYe/_old 2024-03-17 22:16:16.977002044 +0100 +++ /var/tmp/diff_new_pack.iwWuYe/_new 2024-03-17 22:16:16.981002190 +0100 @@ -39,7 +39,7 @@ %endif Name: ansible-runner -Version: 2.3.5 +Version: 2.3.6 Release: 0 Summary: Run ansible-playbook inside an execution environment License: Apache-2.0 ++++++ ansible-runner-2.3.5.tar.gz -> ansible-runner-2.3.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-runner-2.3.5/ChangeLog new/ansible-runner-2.3.6/ChangeLog --- old/ansible-runner-2.3.5/ChangeLog 2024-02-13 20:16:52.000000000 +0100 +++ new/ansible-runner-2.3.6/ChangeLog 2024-03-12 16:20:33.000000000 +0100 @@ -1,6 +1,11 @@ CHANGES ======= +2.3.6 +----- + +* Untag instead of force remove image for podman (#1342) (#1344) + 2.3.5 ----- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-runner-2.3.5/PKG-INFO new/ansible-runner-2.3.6/PKG-INFO --- old/ansible-runner-2.3.5/PKG-INFO 2024-02-13 20:16:52.580576700 +0100 +++ new/ansible-runner-2.3.6/PKG-INFO 2024-03-12 16:20:33.455338000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: ansible-runner -Version: 2.3.5 +Version: 2.3.6 Summary: "Consistent Ansible Python API and CLI with container and process isolation runtime capabilities" Home-page: https://ansible-runner.readthedocs.io Author: Ansible, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-runner-2.3.5/ansible_runner/cleanup.py new/ansible-runner-2.3.6/ansible_runner/cleanup.py --- old/ansible-runner-2.3.5/ansible_runner/cleanup.py 2024-02-13 20:16:26.000000000 +0100 +++ new/ansible-runner-2.3.6/ansible_runner/cleanup.py 2024-03-12 16:20:03.000000000 +0100 @@ -144,15 +144,29 @@ def cleanup_images(images, runtime='podman'): - """Note: docker will just untag while podman will remove layers with same command""" + """ + `docker rmi` will just untag while + `podman rmi` will untag and remove layers and cause runing container to be killed + for podman we use `untag` to achieve the same behavior + + NOTE: this only untag the image and does not delete the image prune_images need to be call to delete + """ rm_ct = 0 for image_tag in images: stdout = run_command([runtime, 'images', '--format="{{.Repository}}:{{.Tag}}"', image_tag]) if not stdout: continue for discovered_tag in stdout.split('\n'): - stdout = run_command([runtime, 'rmi', discovered_tag.strip().strip('"'), '-f']) - rm_ct += stdout.count('Untagged:') + if runtime == 'podman': + try: + stdout = run_command([runtime, 'untag', image_tag]) + if not stdout: + rm_ct += 1 + except Exception: + pass # best effort untag + else: + stdout = run_command([runtime, 'rmi', discovered_tag.strip().strip('"'), '-f']) + rm_ct += stdout.count('Untagged:') return rm_ct diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-runner-2.3.5/ansible_runner.egg-info/PKG-INFO new/ansible-runner-2.3.6/ansible_runner.egg-info/PKG-INFO --- old/ansible-runner-2.3.5/ansible_runner.egg-info/PKG-INFO 2024-02-13 20:16:52.000000000 +0100 +++ new/ansible-runner-2.3.6/ansible_runner.egg-info/PKG-INFO 2024-03-12 16:20:33.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: ansible-runner -Version: 2.3.5 +Version: 2.3.6 Summary: "Consistent Ansible Python API and CLI with container and process isolation runtime capabilities" Home-page: https://ansible-runner.readthedocs.io Author: Ansible, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ansible-runner-2.3.5/ansible_runner.egg-info/pbr.json new/ansible-runner-2.3.6/ansible_runner.egg-info/pbr.json --- old/ansible-runner-2.3.5/ansible_runner.egg-info/pbr.json 2024-02-13 20:16:52.000000000 +0100 +++ new/ansible-runner-2.3.6/ansible_runner.egg-info/pbr.json 2024-03-12 16:20:33.000000000 +0100 @@ -1 +1 @@ -{"git_version": "c129775", "is_release": false} \ No newline at end of file +{"git_version": "709cdfc", "is_release": false} \ No newline at end of file
