diff options
-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', '>=') |