Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test suse: get tests working on newer OpenSUSE distributions #52539

Merged
merged 1 commit into from Feb 19, 2019
+10 −3
Merged

test suse: get tests working on newer OpenSUSE distributions #52539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion test/integration/targets/cloud_init_data_facts/tasks/main.yml
View file
Open in desktop
Expand Up @@ -5,7 +5,11 @@
# to /etc/init/ureadahead.conf.disabled by cloud-init' clashes with `local diversion of
# /etc/init/ureadahead.conf to /etc/init/ureadahead.conf.distrib
# https://bugs.launchpad.net/ubuntu/+source/ureadahead/+bug/997838
when: ansible_distribution != "Ubuntu" or ansible_distribution_major_version|int != 14
# Will also have to skip on OpenSUSE when running on Python 2 on newer Leap versions
# (!= 42 and >= 15) ascloud-init will install the Python 3 package, breaking our build on py2.
when:
- not (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int == 14)
- not (ansible_os_family == "Suse" and ansible_distribution_major_version|int != 42 and ansible_python.version.major != 3)
block:
- name: setup install cloud-init
package:
Expand Down
7 changes: 5 additions & 2 deletions test/integration/targets/firewalld/tasks/main.yml
View file
Open in desktop
Expand Up @@ -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)