mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-01-12 15:45:20 +01:00
Compare commits
4 commits
bb74d3295d
...
d42434e673
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d42434e673 | ||
|
|
719f7dfebf | ||
|
|
5cae7aa946 | ||
|
|
1228e58b6c |
3 changed files with 8 additions and 5 deletions
|
|
@ -51,8 +51,8 @@ stages:
|
||||||
parameters:
|
parameters:
|
||||||
testFormat: devel/linux/{0}/1
|
testFormat: devel/linux/{0}/1
|
||||||
targets:
|
targets:
|
||||||
- name: Fedora 38
|
- name: Fedora 39
|
||||||
test: fedora38
|
test: fedora39
|
||||||
- name: Ubuntu 20.04
|
- name: Ubuntu 20.04
|
||||||
test: ubuntu2004
|
test: ubuntu2004
|
||||||
- name: Ubuntu 22.04
|
- name: Ubuntu 22.04
|
||||||
|
|
|
||||||
3
changelogs/fragments/510_ci_update.yml
Normal file
3
changelogs/fragments/510_ci_update.yml
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
---
|
||||||
|
trivial:
|
||||||
|
- "Replace Fedora 38 with 39 for container test(https://github.com/ansible-collections/ansible.posix/issues/509)."
|
||||||
|
|
@ -77,7 +77,7 @@ from ansible.module_utils._text import to_text
|
||||||
|
|
||||||
|
|
||||||
def locally_installed(module, pkgname):
|
def locally_installed(module, pkgname):
|
||||||
(rc, out, err) = module.run_command('{0} -q {1}'.format(module.get_bin_path("rpm"), pkgname).split())
|
(rc, _, _) = module.run_command('{0} -q --whatprovides {1}'.format(module.get_bin_path("rpm"), pkgname).split())
|
||||||
return (rc == 0)
|
return (rc == 0)
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -97,9 +97,9 @@ def rpm_ostree_transaction(module):
|
||||||
module.exit_json(msg="No changes made.")
|
module.exit_json(msg="No changes made.")
|
||||||
else:
|
else:
|
||||||
if module.params['state'] in ['present', 'installed', 'latest']:
|
if module.params['state'] in ['present', 'installed', 'latest']:
|
||||||
module.fail_json(msg="The following packages are absent in the currently booted rpm-ostree commit: %s" ' '.join(pkgs))
|
module.fail_json(msg="The following packages are absent in the currently booted rpm-ostree commit: {}".format(' '.join(pkgs)))
|
||||||
else:
|
else:
|
||||||
module.fail_json(msg="The following packages are present in the currently booted rpm-ostree commit: %s" ' '.join(pkgs))
|
module.fail_json(msg="The following packages are present in the currently booted rpm-ostree commit: {}".format(' '.join(pkgs)))
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue