Skip to content

Conversation

@marmarek
Copy link
Member

@marmarek marmarek commented Mar 1, 2025

There it a tendency to merge /usr/bin and /usr/sbin (replace the latter
with a symlink). This caused a few issues already, including SELinux
mislabeling (QubesOS/qubes-issues#9663), file install issues where
%_sbindir RPM macro points at /usr/bin, and now on in-place upgrade
systemd unit points at /usr/sbin/meminfo-writer that doesn't exist at
the upgrade time.

Since this merging happened on Fedora 42 now, and much earlier on
Archlinux too, simplify things by simply moving meminfo-writer to
/usr/bin and don't have any special cases for distributions with merged
/usr/sbin or not. The change isn't relevant for Debian (yet?) but also
shouldn't hurt either.

QubesOS/qubes-issues#9807

There it a tendency to merge /usr/bin and /usr/sbin (replace the latter
with a symlink). This caused a few issues already, including SELinux
mislabeling (QubesOS/qubes-issues#9663), file install issues where
%_sbindir RPM macro points at /usr/bin, and now on in-place upgrade
systemd unit points at /usr/sbin/meminfo-writer that doesn't exist at
the upgrade time.

Since this merging happened on Fedora 42 now, and much earlier on
Archlinux too, simplify things by simply moving meminfo-writer to
/usr/bin and don't have any special cases for distributions with merged
/usr/sbin or not. The change isn't relevant for Debian (yet?) but also
shouldn't hurt either.

QubesOS/qubes-issues#9807
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 60.56%. Comparing base (6578e70) to head (e5fb601).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #123   +/-   ##
=======================================
  Coverage   60.56%   60.56%           
=======================================
  Files           6        6           
  Lines         951      951           
  Branches      104      104           
=======================================
  Hits          576      576           
  Misses        285      285           
  Partials       90       90           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@qubesos-bot
Copy link

qubesos-bot commented Mar 1, 2025

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2025030303-4.3-fedora&flavor=templates

Test run included the following:

New failures, excluding unstable

Compared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2025021804-4.3&flavor=update

  • system_tests_basic_vm_qrexec_gui

  • system_tests_pvgrub_salt_storage

    • TC_41_HVMGrub_fedora-42-xfce: test_000_standalone_vm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

    • TC_41_HVMGrub_fedora-42-xfce: test_010_template_based_vm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

    • TC_42_PVHGrub_fedora-42-xfce: test_000_standalone_vm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

    • TC_42_PVHGrub_fedora-42-xfce: test_010_template_based_vm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

  • system_tests_network_updates

    • TC_00_Dom0Upgrade_fedora-42-xfce: test_001_update_check (failure)
      ^... AssertionError: '1' is not false
  • system_tests_guivm_gui_interactive

    • simple_gui_apps: unnamed test (unknown)

    • simple_gui_apps: Failed (test died)
      # Test died: no candidate needle with tag(s) 'vm-settings-applicati...

    • simple_gui_apps: wait_serial (wait serial expected)
      # wait_serial expected: "lspci; echo 2E8vz-\$?-"...

    • simple_gui_apps: wait_serial (wait serial expected)
      # wait_serial expected: qr/2E8vz-\d+-/...

Failed tests

10 failures
  • system_tests_basic_vm_qrexec_gui

  • system_tests_pvgrub_salt_storage

    • TC_41_HVMGrub_fedora-42-xfce: test_000_standalone_vm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

    • TC_41_HVMGrub_fedora-42-xfce: test_010_template_based_vm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

    • TC_42_PVHGrub_fedora-42-xfce: test_000_standalone_vm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

    • TC_42_PVHGrub_fedora-42-xfce: test_010_template_based_vm (error)
      qubes.exc.QubesVMError: Cannot connect to qrexec agent for 120 seco...

  • system_tests_network_updates

    • TC_00_Dom0Upgrade_fedora-42-xfce: test_001_update_check (failure)
      ^... AssertionError: '1' is not false
  • system_tests_guivm_gui_interactive

    • simple_gui_apps: unnamed test (unknown)

    • simple_gui_apps: Failed (test died)
      # Test died: no candidate needle with tag(s) 'vm-settings-applicati...

    • simple_gui_apps: wait_serial (wait serial expected)
      # wait_serial expected: "lspci; echo 2E8vz-\$?-"...

    • simple_gui_apps: wait_serial (wait serial expected)
      # wait_serial expected: qr/2E8vz-\d+-/...

Fixed failures

Compared to: https://openqa.qubes-os.org/tests/129058#dependencies

6 fixed
  • system_tests_audio

  • system_tests_qrexec

  • system_tests_whonix

    • whonixcheck: fail (unknown)
      Whonixcheck for sys-whonix failed...

    • whonixcheck: unnamed test (unknown)

Unstable tests

Performance Tests

Performance degradation:

No issues

Remaining performance tests:

No remaining performance tests

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants