diff options
| author | Sam Doran <sdoran@redhat.com> | 2019-07-03 11:11:20 -0400 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2019-07-17 15:39:55 -0700 |
| commit | d614abe02df71ee20933e6a10fef91ba42c94e04 (patch) | |
| tree | 79b4a1491c9b212f3e1cf8bd4d96d8e201577760 | |
| parent | 73bbdf4392c788d085c737489a91660fff06f525 (diff) | |
| download | ansible-d614abe02df71ee20933e6a10fef91ba42c94e04.tar.gz | |
[stable-2.6] Improve dnf test formatting and fix RHEL 8 module name (#58648)
- use single include_vars task rather than multiple set_fact tasks
- use multi-line YAML to break up long conditionals
- use version() test rather than direct comparisions
(cherry picked from commit 16d6fcf5148e2a527f5c6e2603490a2e79500a91)
| -rw-r--r-- | test/integration/targets/dnf/tasks/dnf.yml | 2 | ||||
| -rw-r--r-- | test/integration/targets/dnf/tasks/main.yml | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/test/integration/targets/dnf/tasks/dnf.yml b/test/integration/targets/dnf/tasks/dnf.yml index cccc0e925b..91a7b5d4e2 100644 --- a/test/integration/targets/dnf/tasks/dnf.yml +++ b/test/integration/targets/dnf/tasks/dnf.yml @@ -6,6 +6,8 @@ shell: rpm -q python2-dnf register: rpm_result ignore_errors: true + args: + warn: no # Don't uninstall python2-dnf with the `dnf` module in case it needs to load # some dnf python files after the package is uninstalled. diff --git a/test/integration/targets/dnf/tasks/main.yml b/test/integration/targets/dnf/tasks/main.yml index f4931df313..324803dc61 100644 --- a/test/integration/targets/dnf/tasks/main.yml +++ b/test/integration/targets/dnf/tasks/main.yml @@ -19,22 +19,20 @@ # Note: We install the yum package onto Fedora so that this will work on dnf systems # We want to test that for people who don't want to upgrade their systems. -- include: 'dnf.yml' - when: - - ansible_distribution == 'Fedora' - - ansible_distribution_major_version|int >= 23 +- include_tasks: dnf.yml + when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('23', '>=')) or + (ansible_distribution == 'RedHat' and ansible_distribution_major_version is version('8', '>=')) -- include: 'repo.yml' - when: - - ansible_distribution == 'Fedora' - - ansible_distribution_major_version|int >= 23 +- include_tasks: repo.yml + when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('23', '>=')) or + (ansible_distribution == 'RedHat' and ansible_distribution_major_version is version('8', '>=')) -- include: 'dnfinstallroot.yml' - when: - - ansible_distribution == 'Fedora' - - ansible_distribution_major_version|int >= 23 +- include_tasks: dnfinstallroot.yml + when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('23', '>=')) or + (ansible_distribution == 'RedHat' and ansible_distribution_major_version is version('8', '>=')) -- include: 'dnfreleasever.yml' +# Attempting to install a different RHEL release in a tmpdir doesn't work (rhel8 beta) +- include_tasks: dnfreleasever.yml when: - ansible_distribution == 'Fedora' - - ansible_distribution_major_version|int >= 23 + - ansible_distribution_major_version is version('23', '>=') |