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

fix(qubes-download-dom0-updates): manually specify vars dir in args #555

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

gianklug
Copy link

This fixes custom vars for DNF on updatevms running Fedora 41.

Even though the custom variables are copied over here, dnf only replaces them with the added args in this patch on Fedora versions > 40.

@gianklug gianklug force-pushed the fix/qubes-download-dom0-updates/add_vars_arg branch 2 times, most recently from 679ddab to 3f1b9ed Compare February 25, 2025 15:13
@gianklug
Copy link
Author

Commit signing should've been fixed, please re-run.

Copy link

codecov bot commented Feb 25, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.57%. Comparing base (529e8b2) to head (3f1b9ed).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #555   +/-   ##
=======================================
  Coverage   70.57%   70.57%           
=======================================
  Files           3        3           
  Lines         469      469           
=======================================
  Hits          331      331           
  Misses        138      138           

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

@marmarek
Copy link
Member

Commit signing should've been fixed, please re-run.

Looks like the bot for checking signatures doesn't support SSH signing... ignore this problem for now.

@marmarek
Copy link
Member

openQA said now installing packages for dom0 fails with:

Failed to download metadata (metalink: "https://yum.qubes-os.org/r41/current/host/fc41/repodata/repomd.xml.metalink") for repository "qubes-dom0-current"

The "r41" in the URL is wrong, should be "r4.3". Looks like it took fedora version from updatevm, instead of qubes-release version from dom0's rpmdb.
I'm not 100% sure if it's caused by this PR, but pretty likely. It worked in another test run 2 days ago. Alternative cause could be some DNF update in Fedora in the meantime, but last one I see a week ago.

@qubesos-bot
Copy link

qubesos-bot commented Feb 27, 2025

OpenQA test summary

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

  • system_tests_network

    • startup: unnamed test (unknown)
    • startup: Failed (test died)
      # Test died: no candidate needle with tag(s) 'nm-connection-establi...
  • system_tests_guivm_gui_interactive

    • update_guivm: Failed (test died)
      # Test died: command '(set -o pipefail; qubesctl --all --show-outpu...
  • system_tests_network_updates

  • system_tests_backupdispvm

    • TC_10_RestoreInDispVM_debian-12-xfce: test_000_basic_backup (failure)
      test-inst-testhvm1 | StandaloneVM | n/a | ...

    • TC_10_RestoreInDispVM_fedora-41-xfce: test_000_basic_backup (failure)
      test-inst-testhvm1 | StandaloneVM | n/a | ...

    • TC_10_RestoreInDispVM_whonix-gateway-17: test_000_basic_backup (failure)
      test-inst-testhvm1 | StandaloneVM | n/a | ...

    • TC_10_RestoreInDispVM_whonix-workstation-17: test_000_basic_backup (failure)
      test-inst-testhvm1 | StandaloneVM | n/a | ...

  • system_tests_kde_gui_interactive

    • kde_install: Failed (test died)
      # Test died: command '(set -o pipefail; sudo qubes-dom0-update -y k...
  • system_tests_guivm_vnc_gui_interactive

    • update_guivm: Failed (test died)
      # Test died: command '(set -o pipefail; qubesctl --all --show-outpu...
  • system_tests_audio@hw1

  • system_tests_update@hw13

    • update2: Failed (test died)
      # Test died: command 'script -c 'qubes-vm-update --force-update --l...
  • system_tests_basic_vm_qrexec_gui_btrfs

  • system_tests_basic_vm_qrexec_gui_ext4

  • install_default_upload@hw7

    • install_startup: unnamed test (unknown)
    • install_startup: Failed (test died)
      # Test died: no candidate needle with tag(s) 'installer' matched...
  • system_tests_basic_vm_qrexec_gui_zfs

    • switch_pool: Failed (test died)
      # Test died: command 'qubes-dom0-update -y zfs' failed at /usr/lib/...

Failed tests

21 failures
  • system_tests_basic_vm_qrexec_gui

  • system_tests_network

    • startup: unnamed test (unknown)
    • startup: Failed (test died)
      # Test died: no candidate needle with tag(s) 'nm-connection-establi...
  • system_tests_guivm_gui_interactive

    • update_guivm: Failed (test died)
      # Test died: command '(set -o pipefail; qubesctl --all --show-outpu...
  • system_tests_network_updates

  • system_tests_backupdispvm

    • TC_10_RestoreInDispVM_debian-12-xfce: test_000_basic_backup (failure)
      test-inst-testhvm1 | StandaloneVM | n/a | ...

    • TC_10_RestoreInDispVM_fedora-41-xfce: test_000_basic_backup (failure)
      test-inst-testhvm1 | StandaloneVM | n/a | ...

    • TC_10_RestoreInDispVM_whonix-gateway-17: test_000_basic_backup (failure)
      test-inst-testhvm1 | StandaloneVM | n/a | ...

    • TC_10_RestoreInDispVM_whonix-workstation-17: test_000_basic_backup (failure)
      test-inst-testhvm1 | StandaloneVM | n/a | ...

  • system_tests_kde_gui_interactive

    • kde_install: Failed (test died)
      # Test died: command '(set -o pipefail; sudo qubes-dom0-update -y k...
  • system_tests_guivm_vnc_gui_interactive

    • update_guivm: Failed (test died)
      # Test died: command '(set -o pipefail; qubesctl --all --show-outpu...
  • system_tests_audio@hw1

  • system_tests_update@hw13

    • update2: Failed (test died)
      # Test died: command 'script -c 'qubes-vm-update --force-update --l...
  • system_tests_basic_vm_qrexec_gui_btrfs

  • system_tests_basic_vm_qrexec_gui_ext4

  • install_default_upload@hw7

    • install_startup: unnamed test (unknown)
    • install_startup: Failed (test died)
      # Test died: no candidate needle with tag(s) 'installer' matched...
  • system_tests_basic_vm_qrexec_gui_zfs

    • switch_pool: Failed (test died)
      # Test died: command 'qubes-dom0-update -y zfs' failed at /usr/lib/...

Fixed failures

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

15 fixed
  • system_tests_whonix

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

    • whonixcheck: unnamed test (unknown)

  • system_tests_suspend

    • suspend: unnamed test (unknown)
    • suspend: Failed (test died)
      # Test died: no candidate needle with tag(s) 'SUSPEND-FAILED' match...
  • 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_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_whonix@hw7

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

    • whonixcheck: unnamed test (unknown)

Unstable tests

Performance Tests

Performance degradation:

15 performance degradations
  • dom0_root_seq1m_q1t1_read 3:read_bandwidth_kb: 82526.00 :small_red_triangle_up: ( previous job: 423495.00, degradation: 19.49%)
  • dom0_root_seq1m_q1t1_write 3:write_bandwidth_kb: 63096.00 :small_red_triangle_up: ( previous job: 185030.00, degradation: 34.10%)
  • dom0_root_rnd4k_q32t1_read 3:read_bandwidth_kb: 39686.00 :small_red_triangle_up: ( previous job: 100699.00, degradation: 39.41%)
  • dom0_root_rnd4k_q32t1_write 3:write_bandwidth_kb: 2067.00 :small_red_triangle_up: ( previous job: 3277.00, degradation: 63.08%)
  • dom0_varlibqubes_seq1m_q8t1_write 3:write_bandwidth_kb: 27990.00 :small_red_triangle_up: ( previous job: 95209.00, degradation: 29.40%)
  • fedora-41-xfce_root_seq1m_q1t1_read 3:read_bandwidth_kb: 277915.00 :small_red_triangle_up: ( previous job: 343795.00, degradation: 80.84%)
  • fedora-41-xfce_root_rnd4k_q32t1_write 3:write_bandwidth_kb: 3398.00 :small_red_triangle_up: ( previous job: 3785.00, degradation: 89.78%)
  • fedora-41-xfce_private_seq1m_q8t1_read 3:read_bandwidth_kb: 318039.00 :small_red_triangle_up: ( previous job: 401907.00, degradation: 79.13%)
  • fedora-41-xfce_private_seq1m_q1t1_read 3:read_bandwidth_kb: 290223.00 :small_red_triangle_up: ( previous job: 357875.00, degradation: 81.10%)
  • fedora-41-xfce_private_rnd4k_q1t1_write 3:write_bandwidth_kb: 316.00 :small_red_triangle_up: ( previous job: 1613.00, degradation: 19.59%)
  • fedora-41-xfce_volatile_seq1m_q8t1_read 3:read_bandwidth_kb: 326964.00 :small_red_triangle_up: ( previous job: 392725.00, degradation: 83.26%)
  • fedora-41-xfce_volatile_seq1m_q1t1_write 3:write_bandwidth_kb: 57275.00 :small_red_triangle_up: ( previous job: 78093.00, degradation: 73.34%)
  • fedora-41-xfce_volatile_rnd4k_q32t1_read 3:read_bandwidth_kb: 30098.00 :small_red_triangle_up: ( previous job: 71108.00, degradation: 42.33%)
  • fedora-41-xfce_volatile_rnd4k_q32t1_write 3:write_bandwidth_kb: 2829.00 :small_red_triangle_up: ( previous job: 3959.00, degradation: 71.46%)
  • fedora-41-xfce_volatile_rnd4k_q1t1_write 3:write_bandwidth_kb: 848.00 :small_red_triangle_up: ( previous job: 2693.00, degradation: 31.49%)

Remaining performance tests:

25 tests
  • dom0_root_seq1m_q8t1_read 3:read_bandwidth_kb: 474254.00 :small_red_triangle_up: ( previous job: 486352.00, degradation: 97.51%)
  • dom0_root_seq1m_q8t1_write 3:write_bandwidth_kb: 254632.00 :small_red_triangle_up: ( previous job: 276742.00, degradation: 92.01%)
  • dom0_root_rnd4k_q1t1_read 3:read_bandwidth_kb: 10547.00 :green_circle: ( previous job: 10163.00, improvement: 103.78%)
  • dom0_root_rnd4k_q1t1_write 3:write_bandwidth_kb: 1584.00 :green_circle: ( previous job: 282.00, improvement: 561.70%)
  • dom0_varlibqubes_seq1m_q8t1_read 3:read_bandwidth_kb: 472331.00 :small_red_triangle_up: ( previous job: 475329.00, degradation: 99.37%)
  • dom0_varlibqubes_seq1m_q1t1_read 3:read_bandwidth_kb: 431868.00 :small_red_triangle_up: ( previous job: 433474.00, degradation: 99.63%)
  • dom0_varlibqubes_seq1m_q1t1_write 3:write_bandwidth_kb: 156061.00 :small_red_triangle_up: ( previous job: 164133.00, degradation: 95.08%)
  • dom0_varlibqubes_rnd4k_q32t1_read 3:read_bandwidth_kb: 96420.00 :small_red_triangle_up: ( previous job: 99808.00, degradation: 96.61%)
  • dom0_varlibqubes_rnd4k_q32t1_write 3:write_bandwidth_kb: 9701.00 :green_circle: ( previous job: 8767.00, improvement: 110.65%)
  • dom0_varlibqubes_rnd4k_q1t1_read 3:read_bandwidth_kb: 7626.00 :green_circle: ( previous job: 7053.00, improvement: 108.12%)
  • dom0_varlibqubes_rnd4k_q1t1_write 3:write_bandwidth_kb: 4467.00 :green_circle: ( previous job: 3868.00, improvement: 115.49%)
  • fedora-41-xfce_root_seq1m_q8t1_read 3:read_bandwidth_kb: 378001.00 :small_red_triangle_up: ( previous job: 396586.00, degradation: 95.31%)
  • fedora-41-xfce_root_seq1m_q8t1_write 3:write_bandwidth_kb: 164925.00 :green_circle: ( previous job: 99783.00, improvement: 165.28%)
  • fedora-41-xfce_root_seq1m_q1t1_write 3:write_bandwidth_kb: 82303.00 :green_circle: ( previous job: 44770.00, improvement: 183.84%)
  • fedora-41-xfce_root_rnd4k_q32t1_read 3:read_bandwidth_kb: 85076.00 :small_red_triangle_up: ( previous job: 86742.00, degradation: 98.08%)
  • fedora-41-xfce_root_rnd4k_q1t1_read 3:read_bandwidth_kb: 8611.00 :small_red_triangle_up: ( previous job: 8623.00, degradation: 99.86%)
  • fedora-41-xfce_root_rnd4k_q1t1_write 3:write_bandwidth_kb: 1196.00 :green_circle: ( previous job: 1126.00, improvement: 106.22%)
  • fedora-41-xfce_private_seq1m_q8t1_write 3:write_bandwidth_kb: 270042.00 :green_circle: ( previous job: 116848.00, improvement: 231.11%)
  • fedora-41-xfce_private_seq1m_q1t1_write 3:write_bandwidth_kb: 136615.00 :green_circle: ( previous job: 41375.00, improvement: 330.19%)
  • fedora-41-xfce_private_rnd4k_q32t1_read 3:read_bandwidth_kb: 89678.00 :green_circle: ( previous job: 87999.00, improvement: 101.91%)
  • fedora-41-xfce_private_rnd4k_q32t1_write 3:write_bandwidth_kb: 3982.00 :green_circle: ( previous job: 3885.00, improvement: 102.50%)
  • fedora-41-xfce_private_rnd4k_q1t1_read 3:read_bandwidth_kb: 8924.00 :green_circle: ( previous job: 8744.00, improvement: 102.06%)
  • fedora-41-xfce_volatile_seq1m_q8t1_write 3:write_bandwidth_kb: 174730.00 :green_circle: ( previous job: 139933.00, improvement: 124.87%)
  • fedora-41-xfce_volatile_seq1m_q1t1_read 3:read_bandwidth_kb: 341778.00 :green_circle: ( previous job: 294875.00, improvement: 115.91%)
  • fedora-41-xfce_volatile_rnd4k_q1t1_read 3:read_bandwidth_kb: 8225.00 :small_red_triangle_up: ( previous job: 8408.00, degradation: 97.82%)

@marmarek
Copy link
Member

Yes, it's this PR. A test run without it works okay.

@gianklug
Copy link
Author

Oh, well. Guess I'll have to do some debugging as to why this happens. Does the OpenQA test use any non-standard dnf variables or overwrites some standard ones? That would probably explain the errors.

@marmarek
Copy link
Member

  • system_tests_guivm_vnc_gui_interactive

    • update_guivm: Failed (test died)
      # Test died: command '(set -o pipefail; qubesctl --all --show-outpu...

This is the thing that failed specifically. So, it's qubes-dom0-update call via Salt's pkg.installed module... Unfortunately it doesn't print full command it used...

@marmarek
Copy link
Member

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants