diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 027a2f0932..8a9651fe33 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -297,10 +297,10 @@ stages: targets: - name: CentOS 7 test: centos7 - - name: Fedora 33 - test: fedora33 - name: Fedora 34 test: fedora34 + - name: Fedora 35 + test: fedora35 - name: openSUSE 15 py2 test: opensuse15py2 - name: openSUSE 15 py3 diff --git a/tests/integration/targets/filesystem/tasks/main.yml b/tests/integration/targets/filesystem/tasks/main.yml index 24259107fd..864c9f7b5d 100644 --- a/tests/integration/targets/filesystem/tasks/main.yml +++ b/tests/integration/targets/filesystem/tasks/main.yml @@ -45,6 +45,9 @@ - '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 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 - 'not (item.0.key == "ocfs2" and ansible_os_family != "Debian")' # Tests use losetup which can not be used inside unprivileged container diff --git a/tests/integration/targets/filesystem/tasks/setup.yml b/tests/integration/targets/filesystem/tasks/setup.yml index 597692e25a..2564bb610b 100644 --- a/tests/integration/targets/filesystem/tasks/setup.yml +++ b/tests/integration/targets/filesystem/tasks/setup.yml @@ -44,7 +44,7 @@ name: reiserfs-utils state: present when: - - ansible_distribution == 'Fedora' + - ansible_distribution == 'Fedora' and (ansible_facts.distribution_major_version | int < 35) - name: "Install reiserfs (OpenSuse)" ansible.builtin.package: