diff options
| author | Jordan Borean <jborean93@gmail.com> | 2019-02-19 04:20:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-19 04:20:08 +0100 |
| commit | c312287731b4658deadbc36edde391d2f6f16ee8 (patch) | |
| tree | e42ef1d983f491036f140ab29bef1340c5302e3f /test/integration/targets/firewalld | |
| parent | foreman: Use generic python in test run (#52544) (diff) | |
| download | ansible-c312287731b4658deadbc36edde391d2f6f16ee8.tar.xz ansible-c312287731b4658deadbc36edde391d2f6f16ee8.zip | |
test suse: get tests working on newer OpenSUSE distributions (#52539)
Diffstat (limited to 'test/integration/targets/firewalld')
| -rw-r--r-- | test/integration/targets/firewalld/tasks/main.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/test/integration/targets/firewalld/tasks/main.yml b/test/integration/targets/firewalld/tasks/main.yml index 1cc9895698..3740645834 100644 --- a/test/integration/targets/firewalld/tasks/main.yml +++ b/test/integration/targets/firewalld/tasks/main.yml @@ -31,5 +31,8 @@ - import_tasks: run_all_tests.yml when: check_output.rc == 0 - when: not (ansible_os_family == "RedHat" and ansible_distribution_major_version|int < 7) and - not (ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04") + when: + - not (ansible_os_family == "RedHat" and ansible_distribution_major_version|int < 7) + - not (ansible_distribution == "Ubuntu" and ansible_distribution_version == "14.04") + # Firewalld package on OpenSUSE (15+) require Python 3, so we skip on OpenSUSE running py2 on these newer distros + - not (ansible_os_family == "Suse" and ansible_distribution_major_version|int != 42 and ansible_python.version.major != 3) |