From cb2646b56317ebc2a38072c0702d640218e44b2d Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Thu, 5 Nov 2026 13:54:23 +0100 Subject: [PATCH 1/4] ci: Better test coverage with packit and testing farm New FIPS test plan and adding more Fedora versions and CentOS to the test matrix. --- .packit.yaml | 19 +++++++++++++++++++ plans/tests-rhel.fmf | 6 ++++++ 2 files changed, 25 insertions(+) diff --git a/.packit.yaml b/.packit.yaml index 551d4802d..7bfb1f863 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -23,6 +23,9 @@ jobs: - fedora-latest-stable-aarch64 - fedora-latest-stable-ppc64le - fedora-latest-stable-x86_64 + - centos-stream-10-aarch64 + - centos-stream-10-ppc64le + - centos-stream-10-x86_64 trigger: pull_request branch: master @@ -100,8 +103,24 @@ jobs: - fedora-latest-aarch64 - fedora-latest-stable-x86_64 - fedora-latest-stable-aarch64 + - fedora-rawhide-x86_64 + - fedora-rawhide-aarch64 + - centos-stream-10-x86_64 + - centos-stream-10-aarch64 branch: master +- job: tests + identifier: fips + trigger: pull_request + targets: + - centos-stream-10-x86_64 + branch: master + tf_extra_params: + environments: + - tmt: + context: + fips: "yes" + - job: tests trigger: pull_request targets: diff --git a/plans/tests-rhel.fmf b/plans/tests-rhel.fmf index 349e38dd5..5a28a68ba 100644 --- a/plans/tests-rhel.fmf +++ b/plans/tests-rhel.fmf @@ -5,6 +5,12 @@ adjust+: enabled: false - when: distro == fedora enabled: false + - when: fips == yes + summary: Run tests in FIPS mode + prepare+: + - name: fips + how: feature + fips: enabled prepare: - name: copr From 5e5eed7144f9048258f99dcd7008ed1f661c30d1 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Thu, 5 Nov 2026 15:27:22 +0100 Subject: [PATCH 2/4] misc: Add exfatprogs to test dependencies on CentOS --- misc/libblockdev-tasks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/misc/libblockdev-tasks.yml b/misc/libblockdev-tasks.yml index aa077f85b..376e9b2b9 100644 --- a/misc/libblockdev-tasks.yml +++ b/misc/libblockdev-tasks.yml @@ -110,6 +110,7 @@ - device-mapper-multipath - dosfstools - e2fsprogs + - exfatprogs - glibc-all-langpacks - lvm2-dbusd - mdadm From db81b5a26846c0957ed1af4965773f7646ead739 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Thu, 5 Nov 2026 15:32:26 +0100 Subject: [PATCH 3/4] tests: Move exfatprogs version check to the test class Currently the check is on the module level which means it runs during module load and on systems without exfatprogs the module load will fail instead of simply skipping the tests. --- tests/fs_tests/exfat_test.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/tests/fs_tests/exfat_test.py b/tests/fs_tests/exfat_test.py index 74e174fb2..7183577cb 100644 --- a/tests/fs_tests/exfat_test.py +++ b/tests/fs_tests/exfat_test.py @@ -1,6 +1,7 @@ import os import re import tempfile +import unittest from packaging.version import Version @@ -21,9 +22,6 @@ def _get_exfatprogs_version(): return Version(m.groups()[0]) -EXFATPROGS_VERSION = _get_exfatprogs_version() - - class ExfatNoDevTestCase(FSNoDevTestCase): def setUp(self): super(ExfatNoDevTestCase, self).setUp() @@ -33,19 +31,23 @@ def setUp(self): class ExfatTestCase(FSTestCase): - def setUp(self): - if not self.exfat_avail: - self.skipTest("skipping exFAT: not available") + @classmethod + def setUpClass(cls): + super(ExfatTestCase, cls).setUpClass() + + if not cls.exfat_avail: + raise unittest.SkipTest("skipping exFAT: not available") + if _get_exfatprogs_version() < Version("1.4.0"): + cls._mkfs_options = None + else: + cls._mkfs_options = [BlockDev.ExtraArg.new("-P", "none")] + + def setUp(self): super(ExfatTestCase, self).setUp() self.mount_dir = tempfile.mkdtemp(prefix="libblockdev.", suffix="exfat_test") - if EXFATPROGS_VERSION < Version("1.4.0"): - self._mkfs_options = None - else: - self._mkfs_options = [BlockDev.ExtraArg.new("-P", "none")] - class ExfatTestAvailability(ExfatNoDevTestCase): From 952d278fd4b2dccd3fdfc4f783bfde173f805519 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Thu, 5 Nov 2026 17:05:05 +0100 Subject: [PATCH 4/4] misc: Allow vendor change when installing build dependencies This allows upgrading packages like libbytesize from our Copr. --- misc/libblockdev-tasks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/misc/libblockdev-tasks.yml b/misc/libblockdev-tasks.yml index 376e9b2b9..8650ff81e 100644 --- a/misc/libblockdev-tasks.yml +++ b/misc/libblockdev-tasks.yml @@ -19,7 +19,7 @@ when: ansible_facts['distribution'] == 'Fedora' - name: Install build dependencies (Fedora) - command: "dnf -y builddep libblockdev --nogpgcheck" + command: "dnf -y builddep libblockdev --nogpgcheck --allow-vendor-change" when: ansible_facts['distribution'] == 'Fedora' - name: Install build dependencies not covered by dnf builddep (Fedora)