test suse: get tests working on newer OpenSUSE distributions (#52539)
(cherry picked from commit c312287731
)
This commit is contained in:
parent
bf7597efe1
commit
773b20886c
2 changed files with 10 additions and 3 deletions
|
@ -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:
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue