Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move all binaries from /usr/sbin to /usr/bin #68

Merged
merged 2 commits into from
Mar 3, 2025

Conversation

marmarek
Copy link
Member

@marmarek marmarek commented Mar 1, 2025

In practice only qubesdb-daemon remained in /usr/sbin.
Since Fedora 42 merged those two, it ends up in /usr/bin anyway, and
since its harmless on other distros, move it everywhere. This simplifies
for example systemd unit handling (which otherwise would sometimes need
/usr/bin and sometimes /usr/sbin path).

QubesOS/qubes-issues#9807

@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=2025030306-4.3&flavor=pull-requests

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_extra

    • TC_00_QVCTest_whonix-workstation-17: test_010_screenshare (failure)
      ~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError: 0 == 0
  • system_tests_qrexec

  • system_tests_kde_gui_interactive

    • gui_keyboard_layout: wait_serial (wait serial expected)
      # wait_serial expected: "echo -e '[Layout]\nLayoutList=us,de' | sud...

    • gui_keyboard_layout: Failed (test died)
      # Test died: command 'test "$(cd ~user;ls e1*)" = "$(qvm-run -p wor...

  • system_tests_basic_vm_qrexec_gui_ext4

    • TC_20_NonAudio_whonix-workstation-17-pool: test_000_start_shutdown (error + cleanup)
      raise TimeoutError from exc_val... TimeoutError
  • system_tests_guivm_gui_interactive

    • guivm_manager: unnamed test (unknown)

    • guivm_manager: Failed (test died)
      # Test died: no candidate needle with tag(s) 'manager-work' matched...

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

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

Failed tests

9 failures
  • system_tests_extra

    • TC_00_QVCTest_whonix-workstation-17: test_010_screenshare (failure)
      ~~~~~~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^^^... AssertionError: 0 == 0
  • system_tests_qrexec

  • system_tests_kde_gui_interactive

    • gui_keyboard_layout: wait_serial (wait serial expected)
      # wait_serial expected: "echo -e '[Layout]\nLayoutList=us,de' | sud...

    • gui_keyboard_layout: Failed (test died)
      # Test died: command 'test "$(cd ~user;ls e1*)" = "$(qvm-run -p wor...

  • system_tests_basic_vm_qrexec_gui_ext4

    • TC_20_NonAudio_whonix-workstation-17-pool: test_000_start_shutdown (error + cleanup)
      raise TimeoutError from exc_val... TimeoutError
  • system_tests_guivm_gui_interactive

    • guivm_manager: unnamed test (unknown)

    • guivm_manager: Failed (test died)
      # Test died: no candidate needle with tag(s) 'manager-work' matched...

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

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

Fixed failures

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

15 fixed
  • system_tests_qrexec

  • system_tests_kde_gui_interactive

    • clipboard_and_web: unnamed test (unknown)
    • clipboard_and_web: Failed (test died)
      # Test died: no candidate needle with tag(s) 'clipboard-paste-notif...
  • system_tests_audio

  • system_tests_whonix@hw7

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

    • whonixcheck: unnamed test (unknown)

  • system_tests_basic_vm_qrexec_gui_btrfs

    • TC_03_QvmRevertTemplateChanges: test_000_revert_linux (error)
      subprocess.CalledProcessError: Command '['sha1sum', '/var/lib/qubes...
  • system_tests_suspend@hw1

    • suspend: unnamed test (unknown)
    • suspend: Failed (test died)
      # Test died: no candidate needle with tag(s) 'SUSPEND-FAILED' match...
  • system_tests_suspend

    • suspend: unnamed test (unknown)
    • suspend: Failed (test died)
      # Test died: no candidate needle with tag(s) 'SUSPEND-FAILED' match...
  • system_tests_whonix

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

    • whonixcheck: unnamed test (unknown)

Unstable tests

Performance Tests

Performance degradation:

31 performance degradations
  • debian-12-xfce_exec-data-simplex: 71.44 :small_red_triangle_up: ( previous job: 48.93, degradation: 146.01%)
  • debian-12-xfce_exec-data-duplex: 69.01 :small_red_triangle_up: ( previous job: 50.76, degradation: 135.96%)
  • debian-12-xfce_exec-data-duplex-root: 88.66 :small_red_triangle_up: ( previous job: 64.91, degradation: 136.60%)
  • debian-12-xfce_socket-data-duplex: 152.61 :small_red_triangle_up: ( previous job: 81.49, degradation: 187.28%)
  • fedora-41-xfce_exec-data-simplex: 62.27 :small_red_triangle_up: ( previous job: 49.65, degradation: 125.41%)
  • fedora-41-xfce_exec-data-duplex: 65.40 :small_red_triangle_up: ( previous job: 49.08, degradation: 133.25%)
  • fedora-41-xfce_exec-data-duplex-root: 97.72 :small_red_triangle_up: ( previous job: 81.65, degradation: 119.68%)
  • fedora-41-xfce_socket-data-duplex: 140.21 :small_red_triangle_up: ( previous job: 78.62, degradation: 178.33%)
  • whonix-gateway-17_exec-root: 42.79 :small_red_triangle_up: ( previous job: 38.36, degradation: 111.53%)
  • whonix-gateway-17_socket-root: 9.24 :small_red_triangle_up: ( previous job: 8.27, degradation: 111.64%)
  • whonix-gateway-17_exec-data-simplex: 70.52 :small_red_triangle_up: ( previous job: 48.76, degradation: 144.61%)
  • whonix-gateway-17_exec-data-duplex: 73.87 :small_red_triangle_up: ( previous job: 48.55, degradation: 152.13%)
  • whonix-gateway-17_exec-data-duplex-root: 92.88 :small_red_triangle_up: ( previous job: 70.13, degradation: 132.44%)
  • whonix-gateway-17_socket-data-duplex: 171.22 :small_red_triangle_up: ( previous job: 82.74, degradation: 206.94%)
  • whonix-workstation-17_exec-data-simplex: 61.57 :small_red_triangle_up: ( previous job: 47.01, degradation: 130.96%)
  • whonix-workstation-17_exec-data-duplex: 61.42 :small_red_triangle_up: ( previous job: 49.48, degradation: 124.15%)
  • whonix-workstation-17_exec-data-duplex-root: 101.17 :small_red_triangle_up: ( previous job: 79.93, degradation: 126.57%)
  • whonix-workstation-17_socket-data-duplex: 153.74 :small_red_triangle_up: ( previous job: 81.71, degradation: 188.15%)
  • dom0_root_seq1m_q8t1_read 3:read_bandwidth_kb: 396737.00 :small_red_triangle_up: ( previous job: 486352.00, degradation: 81.57%)
  • dom0_root_seq1m_q8t1_write 3:write_bandwidth_kb: 87943.00 :small_red_triangle_up: ( previous job: 276742.00, degradation: 31.78%)
  • dom0_root_seq1m_q1t1_read 3:read_bandwidth_kb: 97805.00 :small_red_triangle_up: ( previous job: 423495.00, degradation: 23.09%)
  • dom0_root_seq1m_q1t1_write 3:write_bandwidth_kb: 99135.00 :small_red_triangle_up: ( previous job: 185030.00, degradation: 53.58%)
  • dom0_varlibqubes_rnd4k_q32t1_read 3:read_bandwidth_kb: 55511.00 :small_red_triangle_up: ( previous job: 99808.00, degradation: 55.62%)
  • dom0_varlibqubes_rnd4k_q1t1_write 3:write_bandwidth_kb: 2987.00 :small_red_triangle_up: ( previous job: 3868.00, degradation: 77.22%)
  • fedora-41-xfce_root_seq1m_q1t1_read 3:read_bandwidth_kb: 307410.00 :small_red_triangle_up: ( previous job: 343795.00, degradation: 89.42%)
  • fedora-41-xfce_root_rnd4k_q32t1_write 3:write_bandwidth_kb: 1924.00 :small_red_triangle_up: ( previous job: 3785.00, degradation: 50.83%)
  • fedora-41-xfce_root_rnd4k_q1t1_read 3:read_bandwidth_kb: 7156.00 :small_red_triangle_up: ( previous job: 8623.00, degradation: 82.99%)
  • fedora-41-xfce_private_seq1m_q1t1_read 3:read_bandwidth_kb: 307140.00 :small_red_triangle_up: ( previous job: 357875.00, degradation: 85.82%)
  • fedora-41-xfce_private_rnd4k_q1t1_write 3:write_bandwidth_kb: 753.00 :small_red_triangle_up: ( previous job: 1613.00, degradation: 46.68%)
  • fedora-41-xfce_volatile_seq1m_q1t1_write 3:write_bandwidth_kb: 44539.00 :small_red_triangle_up: ( previous job: 78093.00, degradation: 57.03%)
  • fedora-41-xfce_volatile_rnd4k_q1t1_write 3:write_bandwidth_kb: 1384.00 :small_red_triangle_up: ( previous job: 2693.00, degradation: 51.39%)

Remaining performance tests:

41 tests
  • debian-12-xfce_exec: 7.49 :small_red_triangle_up: ( previous job: 7.15, degradation: 104.75%)
  • debian-12-xfce_exec-root: 29.02 :small_red_triangle_up: ( previous job: 27.97, degradation: 103.76%)
  • debian-12-xfce_socket: 8.98 :small_red_triangle_up: ( previous job: 8.33, degradation: 107.87%)
  • debian-12-xfce_socket-root: 8.51 :small_red_triangle_up: ( previous job: 8.20, degradation: 103.70%)
  • fedora-41-xfce_exec: 9.25 :small_red_triangle_up: ( previous job: 9.13, degradation: 101.27%)
  • fedora-41-xfce_exec-root: 66.19 :small_red_triangle_up: ( previous job: 61.17, degradation: 108.20%)
  • fedora-41-xfce_socket: 9.07 :small_red_triangle_up: ( previous job: 8.66, degradation: 104.72%)
  • fedora-41-xfce_socket-root: 8.81 :small_red_triangle_up: ( previous job: 8.61, degradation: 102.31%)
  • whonix-gateway-17_exec: 7.14 🟢 ( previous job: 7.87, improvement: 90.72%)
  • whonix-gateway-17_socket: 8.13 :small_red_triangle_up: ( previous job: 7.54, degradation: 107.72%)
  • whonix-workstation-17_exec: 8.32 :small_red_triangle_up: ( previous job: 8.23, degradation: 101.04%)
  • whonix-workstation-17_exec-root: 56.69 :small_red_triangle_up: ( previous job: 52.56, degradation: 107.86%)
  • whonix-workstation-17_socket: 8.84 :small_red_triangle_up: ( previous job: 8.21, degradation: 107.69%)
  • whonix-workstation-17_socket-root: 8.00 🟢 ( previous job: 8.20, improvement: 97.59%)
  • dom0_root_rnd4k_q32t1_read 3:read_bandwidth_kb: 95387.00 :small_red_triangle_up: ( previous job: 100699.00, degradation: 94.72%)
  • dom0_root_rnd4k_q32t1_write 3:write_bandwidth_kb: 5334.00 :green_circle: ( previous job: 3277.00, improvement: 162.77%)
  • dom0_root_rnd4k_q1t1_read 3:read_bandwidth_kb: 10765.00 :green_circle: ( previous job: 10163.00, improvement: 105.92%)
  • dom0_root_rnd4k_q1t1_write 3:write_bandwidth_kb: 3996.00 :green_circle: ( previous job: 282.00, improvement: 1417.02%)
  • dom0_varlibqubes_seq1m_q8t1_read 3:read_bandwidth_kb: 429568.00 :small_red_triangle_up: ( previous job: 475329.00, degradation: 90.37%)
  • dom0_varlibqubes_seq1m_q8t1_write 3:write_bandwidth_kb: 278580.00 :green_circle: ( previous job: 95209.00, improvement: 292.60%)
  • dom0_varlibqubes_seq1m_q1t1_read 3:read_bandwidth_kb: 435636.00 :green_circle: ( previous job: 433474.00, improvement: 100.50%)
  • dom0_varlibqubes_seq1m_q1t1_write 3:write_bandwidth_kb: 184843.00 :green_circle: ( previous job: 164133.00, improvement: 112.62%)
  • dom0_varlibqubes_rnd4k_q32t1_write 3:write_bandwidth_kb: 10123.00 :green_circle: ( previous job: 8767.00, improvement: 115.47%)
  • dom0_varlibqubes_rnd4k_q1t1_read 3:read_bandwidth_kb: 7810.00 :green_circle: ( previous job: 7053.00, improvement: 110.73%)
  • fedora-41-xfce_root_seq1m_q8t1_read 3:read_bandwidth_kb: 377729.00 :small_red_triangle_up: ( previous job: 396586.00, degradation: 95.25%)
  • fedora-41-xfce_root_seq1m_q8t1_write 3:write_bandwidth_kb: 216201.00 :green_circle: ( previous job: 99783.00, improvement: 216.67%)
  • fedora-41-xfce_root_seq1m_q1t1_write 3:write_bandwidth_kb: 66676.00 :green_circle: ( previous job: 44770.00, improvement: 148.93%)
  • fedora-41-xfce_root_rnd4k_q32t1_read 3:read_bandwidth_kb: 91449.00 :green_circle: ( previous job: 86742.00, improvement: 105.43%)
  • fedora-41-xfce_root_rnd4k_q1t1_write 3:write_bandwidth_kb: 1149.00 :green_circle: ( previous job: 1126.00, improvement: 102.04%)
  • fedora-41-xfce_private_seq1m_q8t1_read 3:read_bandwidth_kb: 385647.00 :small_red_triangle_up: ( previous job: 401907.00, degradation: 95.95%)
  • fedora-41-xfce_private_seq1m_q8t1_write 3:write_bandwidth_kb: 227161.00 :green_circle: ( previous job: 116848.00, improvement: 194.41%)
  • fedora-41-xfce_private_seq1m_q1t1_write 3:write_bandwidth_kb: 48207.00 :green_circle: ( previous job: 41375.00, improvement: 116.51%)
  • fedora-41-xfce_private_rnd4k_q32t1_read 3:read_bandwidth_kb: 82047.00 :small_red_triangle_up: ( previous job: 87999.00, degradation: 93.24%)
  • fedora-41-xfce_private_rnd4k_q32t1_write 3:write_bandwidth_kb: 3566.00 :small_red_triangle_up: ( previous job: 3885.00, degradation: 91.79%)
  • fedora-41-xfce_private_rnd4k_q1t1_read 3:read_bandwidth_kb: 8521.00 :small_red_triangle_up: ( previous job: 8744.00, degradation: 97.45%)
  • fedora-41-xfce_volatile_seq1m_q8t1_read 3:read_bandwidth_kb: 380332.00 :small_red_triangle_up: ( previous job: 392725.00, degradation: 96.84%)
  • fedora-41-xfce_volatile_seq1m_q8t1_write 3:write_bandwidth_kb: 144136.00 :green_circle: ( previous job: 139933.00, improvement: 103.00%)
  • fedora-41-xfce_volatile_seq1m_q1t1_read 3:read_bandwidth_kb: 324134.00 :green_circle: ( previous job: 294875.00, improvement: 109.92%)
  • fedora-41-xfce_volatile_rnd4k_q32t1_read 3:read_bandwidth_kb: 74227.00 :green_circle: ( previous job: 71108.00, improvement: 104.39%)
  • fedora-41-xfce_volatile_rnd4k_q32t1_write 3:write_bandwidth_kb: 5406.00 :green_circle: ( previous job: 3959.00, improvement: 136.55%)
  • fedora-41-xfce_volatile_rnd4k_q1t1_read 3:read_bandwidth_kb: 8912.00 :green_circle: ( previous job: 8408.00, improvement: 105.99%)

In practice only qubesdb-daemon remained in /usr/sbin.
Since Fedora 42 merged those two, it ends up in /usr/bin anyway, and
since its harmless on other distros, move it everywhere. This simplifies
for example systemd unit handling (which otherwise would sometimes need
/usr/bin and sometimes /usr/sbin path).

But keep /usr/sbin/qubesdb-daemon compatibility symlink in RPM distros
that don't merge sbin with bin yet. This especially applies to F41-based
dom0, where qubesd referrs to /usr/sbin/qubesdb-daemon.

QubesOS/qubes-issues#9807
Copy link
Contributor

@DemiMarie DemiMarie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the confusing commented-out entries in .gitlab-ci.yml, looks good to me.

Comment on lines +12 to +13
# - file: /r4.3/gitlab-host-qwt.yml
# project: QubesOS/qubes-continuous-integration
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this present but commented out? 😕

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be uncommented when QWT tests in CI will be back.

@marmarek marmarek merged commit df97973 into QubesOS:main Mar 3, 2025
2 of 3 checks passed
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