diff --git a/.packit.yaml b/.packit.yaml index 24c783851..64e7b5ddc 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -54,6 +54,7 @@ jobs: trigger: pull_request targets: - fedora-latest + - fedora-latest-stable branch: main # CentOS 10 Stream tests for the 'rhel10-branch' diff --git a/blivet/devicelibs/stratis.py b/blivet/devicelibs/stratis.py index 14b8cb2df..64baa373e 100644 --- a/blivet/devicelibs/stratis.py +++ b/blivet/devicelibs/stratis.py @@ -203,6 +203,8 @@ def create_pool(name, devices, encrypted, passphrase, key_file, clevis): if encrypted and not (passphrase or key_file): raise StratisError("Passphrase or key file must be specified for encrypted pool") + print("calling pool create with options:\nname=%s, device=%s, encrypted=%s" % (name, devices, encrypted)) + raid_opt = GLib.Variant("(bq)", (False, 0)) if encrypted: diff --git a/blivet/devices/storage.py b/blivet/devices/storage.py index 5eed37e6d..92a3a3801 100644 --- a/blivet/devices/storage.py +++ b/blivet/devices/storage.py @@ -343,6 +343,10 @@ def update_sysfs_path(self): try: udev_device = pyudev.Devices.from_device_file(udev.global_udev, self.path) + if self.path.startswith("/dev/nvme"): + print("udev info for %s" % self.path) + print(dict(udev_device)) + os.system("ls -la /dev/sda*") # from_device_file() does not process exceptions but just propagates # any errors that are raised. diff --git a/plans/tests.fmf b/plans/tests.fmf index 6a6d59044..1073e41da 100644 --- a/plans/tests.fmf +++ b/plans/tests.fmf @@ -15,6 +15,7 @@ prepare: # TF prioritizes Fedora tag repo over all others, in particular our daily COPR - for f in $(grep -l -r 'testing-farm-tag-repository' /etc/yum.repos.d); do sed -i '/priority/d' "$f" ;done - sudo dnf -y update + - sudo dnf install nvme-cli - name: ansible how: ansible @@ -22,4 +23,12 @@ prepare: execute: how: tmt - script: sudo make test + script: + - sudo nvme id-ctrl -v /dev/nvme0n1 + - ls -la /dev/sda* + - udevadm info /dev/nvme0n1 + - udevadm info /dev/nvme0n1p1 + - sudo python3 tests/run_tests.py storage_tests.devices_test.stratis_test + - ls -la /dev/sda* + - udevadm info /dev/nvme0n1 + - udevadm info /dev/nvme0n1p1 diff --git a/python-blivet.spec b/python-blivet.spec index 0f72ef256..d90a7944b 100644 --- a/python-blivet.spec +++ b/python-blivet.spec @@ -18,7 +18,7 @@ Source1: http://github.com/storaged-project/blivet/archive/%{realname}-%{realver %global partedver 1.8.1 %global pypartedver 3.10.4 %global utillinuxver 2.15.1 -%global libblockdevver 3.2.0 +%global libblockdevver 3.1.0 %global libbytesizever 0.3 %global pyudevver 0.18 diff --git a/tests/storage_tests/devices_test/stratis_test.py b/tests/storage_tests/devices_test/stratis_test.py index 5aaa12d4f..24e10bbfb 100644 --- a/tests/storage_tests/devices_test/stratis_test.py +++ b/tests/storage_tests/devices_test/stratis_test.py @@ -46,6 +46,7 @@ def _clean_up(self): class StratisTestCase(StratisTestCaseBase): def test_stratis_basic(self): + print("self.vdevs: %s" % self.vdevs) disk = self.storage.devicetree.get_device_by_path(self.vdevs[0]) self.assertIsNotNone(disk) self.storage.initialize_disk(disk) @@ -53,6 +54,10 @@ def test_stratis_basic(self): bd = self.storage.new_partition(size=blivet.size.Size("1 GiB"), fmt_type="stratis", parents=[disk]) self.storage.create_device(bd) + print("bd: %s" % bd) + print("disk: %s" % disk) + os.system("udevadm info /dev/nvme0n1") + os.system("ls -la /dev/sd*") blivet.partitioning.do_partitioning(self.storage)