Skip to content

Resolve merge conflict in PR #359 #364

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 2 commits into from
Closed

Resolve merge conflict in PR #359 #364

wants to merge 2 commits into from

Conversation

marmarek
Copy link
Member

@marmarek marmarek commented Jun 8, 2025

No description provided.

This was referenced Jun 8, 2025
Merged
Merged
Merged
Merged
Merged
Merged
Open
Merged
Merged
@qubesos-bot
Copy link

qubesos-bot commented Jun 8, 2025 •
edited
Loading

OpenQA test summary

Complete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2025062200-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=2025061004-4.3&flavor=update

Failed tests

53 failures

Fixed failures

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

12 fixed

  • system_tests_splitgpg

  • system_tests_extra

  • system_tests_guivm_vnc_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...

  • 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_audio

Unstable tests

Performance Tests

Performance degradation:

4 performance degradations
  • debian-12-xfce_exec-data-simplex: 73.66 🔺 ( previous job: 65.51, degradation: 112.44%)
  • debian-12-xfce_exec-data-duplex-root: 80.24 🔺 ( previous job: 70.01, degradation: 114.61%)
  • dom0_root_rnd4k_q1t1_write 3:write_bandwidth_kb: 1640.00 :small_red_triangle: ( previous job: 1840.00, degradation: 89.13%)
  • dom0_varlibqubes_rnd4k_q32t1_write 3:write_bandwidth_kb: 6864.00 :small_red_triangle: ( previous job: 8874.00, degradation: 77.35%)

Remaining performance tests:

68 tests
  • debian-12-xfce_exec: 7.09 🟢 ( previous job: 8.63, improvement: 82.13%)
  • debian-12-xfce_exec-root: 28.33 🟢 ( previous job: 29.44, improvement: 96.23%)
  • debian-12-xfce_socket: 8.23 🟢 ( previous job: 8.50, improvement: 96.82%)
  • debian-12-xfce_socket-root: 8.43 🔺 ( previous job: 8.31, degradation: 101.34%)
  • debian-12-xfce_exec-data-duplex: 73.97 🔺 ( previous job: 73.55, degradation: 100.58%)
  • debian-12-xfce_socket-data-duplex: 157.50 🟢 ( previous job: 161.35, improvement: 97.61%)
  • fedora-42-xfce_exec: 8.83
  • fedora-42-xfce_exec-root: 58.01
  • fedora-42-xfce_socket: 8.04
  • fedora-42-xfce_socket-root: 7.97
  • fedora-42-xfce_exec-data-simplex: 62.36
  • fedora-42-xfce_exec-data-duplex: 75.82
  • fedora-42-xfce_exec-data-duplex-root: 106.67
  • fedora-42-xfce_socket-data-duplex: 144.24
  • whonix-gateway-17_exec: 7.01 🟢 ( previous job: 7.34, improvement: 95.54%)
  • whonix-gateway-17_exec-root: 40.37 🔺 ( previous job: 39.57, degradation: 102.01%)
  • whonix-gateway-17_socket: 6.25 🟢 ( previous job: 7.85, improvement: 79.63%)
  • whonix-gateway-17_socket-root: 6.75 🟢 ( previous job: 7.89, improvement: 85.56%)
  • whonix-gateway-17_exec-data-simplex: 59.84 🟢 ( previous job: 77.76, improvement: 76.95%)
  • whonix-gateway-17_exec-data-duplex: 77.29 🟢 ( previous job: 78.39, improvement: 98.60%)
  • whonix-gateway-17_exec-data-duplex-root: 93.85 🔺 ( previous job: 90.74, degradation: 103.43%)
  • whonix-gateway-17_socket-data-duplex: 171.19 🔺 ( previous job: 161.95, degradation: 105.71%)
  • whonix-workstation-17_exec: 7.43 🟢 ( previous job: 8.27, improvement: 89.78%)
  • whonix-workstation-17_exec-root: 55.57 🟢 ( previous job: 57.61, improvement: 96.46%)
  • whonix-workstation-17_socket: 9.17 🔺 ( previous job: 8.97, degradation: 102.20%)
  • whonix-workstation-17_socket-root: 7.90 🟢 ( previous job: 9.46, improvement: 83.48%)
  • whonix-workstation-17_exec-data-simplex: 74.62 🔺 ( previous job: 74.54, degradation: 100.11%)
  • whonix-workstation-17_exec-data-duplex: 76.47 🔺 ( previous job: 74.84, degradation: 102.18%)
  • whonix-workstation-17_exec-data-duplex-root: 81.50 🟢 ( previous job: 86.00, improvement: 94.76%)
  • whonix-workstation-17_socket-data-duplex: 167.37 🔺 ( previous job: 160.20, degradation: 104.48%)
  • dom0_root_seq1m_q8t1_read 3:read_bandwidth_kb: 485227.00 :green_circle: ( previous job: 289982.00, improvement: 167.33%)
  • dom0_root_seq1m_q8t1_write 3:write_bandwidth_kb: 260969.00 :green_circle: ( previous job: 101988.00, improvement: 255.88%)
  • dom0_root_seq1m_q1t1_read 3:read_bandwidth_kb: 381161.00 :green_circle: ( previous job: 14284.00, improvement: 2668.45%)
  • dom0_root_seq1m_q1t1_write 3:write_bandwidth_kb: 185308.00 :green_circle: ( previous job: 32696.00, improvement: 566.76%)
  • dom0_root_rnd4k_q32t1_read 3:read_bandwidth_kb: 17277.00 :green_circle: ( previous job: 17102.00, improvement: 101.02%)
  • dom0_root_rnd4k_q32t1_write 3:write_bandwidth_kb: 4397.00 :green_circle: ( previous job: 1091.00, improvement: 403.02%)
  • dom0_root_rnd4k_q1t1_read 3:read_bandwidth_kb: 10918.00 :small_red_triangle: ( previous job: 11086.00, degradation: 98.48%)
  • dom0_varlibqubes_seq1m_q8t1_read 3:read_bandwidth_kb: 356294.00 :green_circle: ( previous job: 289182.00, improvement: 123.21%)
  • dom0_varlibqubes_seq1m_q8t1_write 3:write_bandwidth_kb: 155188.00 :green_circle: ( previous job: 122848.00, improvement: 126.33%)
  • dom0_varlibqubes_seq1m_q1t1_read 3:read_bandwidth_kb: 422642.00 :small_red_triangle: ( previous job: 433654.00, degradation: 97.46%)
  • dom0_varlibqubes_seq1m_q1t1_write 3:write_bandwidth_kb: 178806.00 :green_circle: ( previous job: 167872.00, improvement: 106.51%)
  • dom0_varlibqubes_rnd4k_q32t1_read 3:read_bandwidth_kb: 111824.00 :green_circle: ( previous job: 108760.00, improvement: 102.82%)
  • dom0_varlibqubes_rnd4k_q1t1_read 3:read_bandwidth_kb: 7247.00 :green_circle: ( previous job: 6356.00, improvement: 114.02%)
  • dom0_varlibqubes_rnd4k_q1t1_write 3:write_bandwidth_kb: 5025.00 :green_circle: ( previous job: 4420.00, improvement: 113.69%)
  • fedora-42-xfce_root_seq1m_q8t1_read 3:read_bandwidth_kb: 361577.00
  • fedora-42-xfce_root_seq1m_q8t1_write 3:write_bandwidth_kb: 317461.00
  • fedora-42-xfce_root_seq1m_q1t1_read 3:read_bandwidth_kb: 307680.00
  • fedora-42-xfce_root_seq1m_q1t1_write 3:write_bandwidth_kb: 77290.00
  • fedora-42-xfce_root_rnd4k_q32t1_read 3:read_bandwidth_kb: 93756.00
  • fedora-42-xfce_root_rnd4k_q32t1_write 3:write_bandwidth_kb: 1546.00
  • fedora-42-xfce_root_rnd4k_q1t1_read 3:read_bandwidth_kb: 8388.00
  • fedora-42-xfce_root_rnd4k_q1t1_write 3:write_bandwidth_kb: 1071.00
  • fedora-42-xfce_private_seq1m_q8t1_read 3:read_bandwidth_kb: 351989.00
  • fedora-42-xfce_private_seq1m_q8t1_write 3:write_bandwidth_kb: 275650.00
  • fedora-42-xfce_private_seq1m_q1t1_read 3:read_bandwidth_kb: 291838.00
  • fedora-42-xfce_private_seq1m_q1t1_write 3:write_bandwidth_kb: 141026.00
  • fedora-42-xfce_private_rnd4k_q32t1_read 3:read_bandwidth_kb: 77099.00
  • fedora-42-xfce_private_rnd4k_q32t1_write 3:write_bandwidth_kb: 2192.00
  • fedora-42-xfce_private_rnd4k_q1t1_read 3:read_bandwidth_kb: 9018.00
  • fedora-42-xfce_private_rnd4k_q1t1_write 3:write_bandwidth_kb: 514.00
  • fedora-42-xfce_volatile_seq1m_q8t1_read 3:read_bandwidth_kb: 290544.00
  • fedora-42-xfce_volatile_seq1m_q8t1_write 3:write_bandwidth_kb: 93813.00
  • fedora-42-xfce_volatile_seq1m_q1t1_read 3:read_bandwidth_kb: 286183.00
  • fedora-42-xfce_volatile_seq1m_q1t1_write 3:write_bandwidth_kb: 89132.00
  • fedora-42-xfce_volatile_rnd4k_q32t1_read 3:read_bandwidth_kb: 79431.00
  • fedora-42-xfce_volatile_rnd4k_q32t1_write 3:write_bandwidth_kb: 2781.00
  • fedora-42-xfce_volatile_rnd4k_q1t1_read 3:read_bandwidth_kb: 7969.00
  • fedora-42-xfce_volatile_rnd4k_q1t1_write 3:write_bandwidth_kb: 1615.00

This was referenced Jun 8, 2025
Merged
Merged
Merged
Merged
Draft
Merged
Draft
Merged
Merged
Merged
Closed
This was referenced Jun 9, 2025
Merged
Merged
Merged
Closed
Merged
This was referenced Jun 18, 2025
Merged
Merged
Merged
Merged
Merged
ben-grande and others added 2 commits June 19, 2025 19:30
@ben-grande
Late GUID for preloaded disposables
d8dedb2 
- Autostarted applications don't show when preloading; and
- Preloaded qubes paused before the session will have a working GUI when
  the session starts.

For: QubesOS/qubes-issues#1512
For: QubesOS/qubes-issues#9940
For: QubesOS/qubes-issues#9907
@marmarek
Merge remote-tracking branch 'origin/pr/359' into pr-359-merge
1a63c89 
* origin/pr/359:
  Late GUID for preloaded disposables
@codecov Codecov
Copy link

codecov bot commented Jun 22, 2025 •
edited
Loading

Codecov Report

Attention: Patch coverage is 53.57143% with 13 lines in your changes missing coverage. Please review.

Project coverage is 76.10%. Comparing base (ced1d2f) to head (1a63c89).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
qubesadmin/tools/qvm_start_daemon.py 53.57% 13 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #364      +/-   ##
==========================================
- Coverage   76.12%   76.10%   -0.03%     
==========================================
  Files          53       53              
  Lines        9204     9220      +16     
==========================================
+ Hits         7007     7017      +10     
- Misses       2197     2203       +6

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@qubesos-bot qubesos-bot mentioned this pull request Jun 22, 2025
Merged
@marmarek marmarek closed this Jun 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@marmarek @qubesos-bot @ben-grande