mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
* Replace Fedora 33 with Fedora 35 for devel tests.
* Skip Fedora 35 for reiserfs tests.
(cherry picked from commit fc99893f10
)
Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
9bd2d1ec90
commit
cc264be644
3 changed files with 6 additions and 3 deletions
|
@ -297,10 +297,10 @@ stages:
|
||||||
targets:
|
targets:
|
||||||
- name: CentOS 7
|
- name: CentOS 7
|
||||||
test: centos7
|
test: centos7
|
||||||
- name: Fedora 33
|
|
||||||
test: fedora33
|
|
||||||
- name: Fedora 34
|
- name: Fedora 34
|
||||||
test: fedora34
|
test: fedora34
|
||||||
|
- name: Fedora 35
|
||||||
|
test: fedora35
|
||||||
- name: openSUSE 15 py2
|
- name: openSUSE 15 py2
|
||||||
test: opensuse15py2
|
test: opensuse15py2
|
||||||
- name: openSUSE 15 py3
|
- name: openSUSE 15 py3
|
||||||
|
|
|
@ -45,6 +45,9 @@
|
||||||
- 'not (ansible_distribution in ["CentOS", "RedHat"] and item.0.key in ["f2fs", "reiserfs"])'
|
- 'not (ansible_distribution in ["CentOS", "RedHat"] and item.0.key in ["f2fs", "reiserfs"])'
|
||||||
- 'not (ansible_os_family == "RedHat" and ansible_distribution_major_version is version("8", ">=") and
|
- 'not (ansible_os_family == "RedHat" and ansible_distribution_major_version is version("8", ">=") and
|
||||||
item.0.key == "btrfs")'
|
item.0.key == "btrfs")'
|
||||||
|
# reiserfs-utils package not available with Fedora 35 on CI
|
||||||
|
- 'not (ansible_distribution == "Fedora" and (ansible_facts.distribution_major_version | int >= 35) and
|
||||||
|
item.0.key == "reiserfs")'
|
||||||
# ocfs2 only available on Debian based distributions
|
# ocfs2 only available on Debian based distributions
|
||||||
- 'not (item.0.key == "ocfs2" and ansible_os_family != "Debian")'
|
- 'not (item.0.key == "ocfs2" and ansible_os_family != "Debian")'
|
||||||
# Tests use losetup which can not be used inside unprivileged container
|
# Tests use losetup which can not be used inside unprivileged container
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
name: reiserfs-utils
|
name: reiserfs-utils
|
||||||
state: present
|
state: present
|
||||||
when:
|
when:
|
||||||
- ansible_distribution == 'Fedora'
|
- ansible_distribution == 'Fedora' and (ansible_facts.distribution_major_version | int < 35)
|
||||||
|
|
||||||
- name: "Install reiserfs (OpenSuse)"
|
- name: "Install reiserfs (OpenSuse)"
|
||||||
ansible.builtin.package:
|
ansible.builtin.package:
|
||||||
|
|
Loading…
Reference in a new issue