Merge upstream 07092026

.cursor/skills/minimal-changes/SKILL.md

@@ -0,0 +1,35 @@
+---
+name: minimal-changes
+description: >-
+  Keep code changes and commits small, simple, and focused. Use when implementing
+  features, fixing bugs, refactoring, or reviewing diffs in this repo.
+---
+
+# Minimal Changes
+
+Apply these principles to every change in this repository.
+
+## Core rules
+
+- I want the changes to be as small as possible
+- as simple as possible, don't create many unnecessary functions
+- keep all code changes and commits short and straight forward
+
+## Code
+
+1. **Smallest correct diff** — Change only what the task requires. No drive-by refactors, renames, or formatting outside touched lines.
+2. **Solve inline** — Prefer editing existing code over new helpers, wrappers, or abstractions. Add a function only when reuse or clarity clearly demands it.
+3. **Match the file** — Follow naming, types, and patterns already in the surrounding code.
+4. **Skip noise** — No extra comments, tests, or docs unless requested or required for the fix.
+
+## Commits
+
+Keep each commit focused on one logical change with a short, direct message. For commit format and Jira linking, use the [git-commit](git-commit/SKILL.md) skill.
+
+## Before finishing
+
+- Can anything be removed and still solve the problem?
+- Would a reviewer ask why unrelated lines changed?
+- Is there a helper that could be three inline lines instead?
+
+If yes to the last two, simplify further.

.konflux/virt-v2v-rhel9/builder/rpms.lock.yaml

@@ -4,54 +4,61 @@ lockfileVendor: redhat
 arches:
 - arch: x86_64
   packages:
-  - url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/appstream/os/Packages/l/libvirt-libs-11.10.0-12.3.el9_8.x86_64.rpm
+  - url: https://cdn.redhat.com/content/dist/rhel9/9.6/x86_64/appstream/os/Packages/l/libvirt-libs-10.10.0-7.7.el9_6.x86_64.rpm
     repoid: rhel-9-for-x86_64-appstream-rpms
-    size: 5773365
-    checksum: sha256:0b56ff27258d42e29c49a356796a6f462ecd2f245ea0a484fc11d5cc900a9736
+    size: 5325120
+    checksum: sha256:aaa2440e2be453e33ddb5480163fe4d7b70fb51efdd3d40542d87d7727af58d9
     name: libvirt-libs
-    evr: 11.10.0-12.3.el9_8
-    sourcerpm: libvirt-11.10.0-12.3.el9_8.src.rpm
-  - url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/baseos/os/Packages/c/cyrus-sasl-gssapi-2.1.27-22.el9.x86_64.rpm
+    evr: 10.10.0-7.7.el9_6
+    sourcerpm: libvirt-10.10.0-7.7.el9_6.src.rpm
+  - url: https://cdn.redhat.com/content/dist/rhel9/9.6/x86_64/baseos/os/Packages/c/cyrus-sasl-gssapi-2.1.27-21.el9.x86_64.rpm
     repoid: rhel-9-for-x86_64-baseos-rpms
-    size: 25734
-    checksum: sha256:4829e95f203974198ee79e54957ecd6669dfeb22aab4160ad1cbb67b90f7abec
+    size: 28739
+    checksum: sha256:ea04812e70f7185355de2cf44ccd03dba237e3671b670cd3c53debd7665bc667
     name: cyrus-sasl-gssapi
-    evr: 2.1.27-22.el9
-    sourcerpm: cyrus-sasl-2.1.27-22.el9.src.rpm
-  - url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/baseos/os/Packages/l/libnl3-3.11.0-1.el9.x86_64.rpm
+    evr: 2.1.27-21.el9
+    sourcerpm: cyrus-sasl-2.1.27-21.el9.src.rpm
+  - url: https://cdn.redhat.com/content/dist/rhel9/9.6/x86_64/baseos/os/Packages/c/cyrus-sasl-lib-2.1.27-21.el9.x86_64.rpm
+    repoid: rhel-9-for-x86_64-baseos-rpms
+    size: 792070
+    checksum: sha256:d92f2383e68062b9ded78afa8814f18d84fee98e09781f541169627272ce85cf
+    name: cyrus-sasl-lib
+    evr: 2.1.27-21.el9
+    sourcerpm: cyrus-sasl-2.1.27-21.el9.src.rpm
+  - url: https://cdn.redhat.com/content/dist/rhel9/9.6/x86_64/baseos/os/Packages/l/libnl3-3.11.0-1.el9.x86_64.rpm
     repoid: rhel-9-for-x86_64-baseos-rpms
     size: 376137
     checksum: sha256:89728a253a5bf1c8e01c40573f1283d40188e003bdbd4ac565f8b0f05bced55c
     name: libnl3
     evr: 3.11.0-1.el9
     sourcerpm: libnl3-3.11.0-1.el9.src.rpm
-  - url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/baseos/os/Packages/l/libssh-0.10.4-18.el9.x86_64.rpm
+  - url: https://cdn.redhat.com/content/dist/rhel9/9.6/x86_64/baseos/os/Packages/l/libssh-0.10.4-15.el9_6.x86_64.rpm
     repoid: rhel-9-for-x86_64-baseos-rpms
-    size: 225119
-    checksum: sha256:4a3ec8a0cc0d4f693a876c522d3e4bc2296180b9ec05f958f6a0aa8658702458
+    size: 218637
+    checksum: sha256:7ee387359681560df2ed7df7a18b9ebd7c49b23d24342de891154599f8e6db8a
     name: libssh
-    evr: 0.10.4-18.el9
-    sourcerpm: libssh-0.10.4-18.el9.src.rpm
-  - url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/baseos/os/Packages/l/libssh-config-0.10.4-18.el9.noarch.rpm
+    evr: 0.10.4-15.el9_6
+    sourcerpm: libssh-0.10.4-15.el9_6.src.rpm
+  - url: https://cdn.redhat.com/content/dist/rhel9/9.6/x86_64/baseos/os/Packages/l/libssh-config-0.10.4-15.el9_6.noarch.rpm
     repoid: rhel-9-for-x86_64-baseos-rpms
-    size: 14685
-    checksum: sha256:ab353cbff2269677fc7364bfcddb8e11537ea83361a0ad642e60eac87ed67fbb
+    size: 7991
+    checksum: sha256:845c662af1f78eee4a1f67977a805b551edc939e21d3b201cb332682b18443fb
     name: libssh-config
-    evr: 0.10.4-18.el9
-    sourcerpm: libssh-0.10.4-18.el9.src.rpm
-  - url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/baseos/os/Packages/n/numactl-libs-2.0.19-3.el9.x86_64.rpm
+    evr: 0.10.4-15.el9_6
+    sourcerpm: libssh-0.10.4-15.el9_6.src.rpm
+  - url: https://cdn.redhat.com/content/dist/rhel9/9.6/x86_64/baseos/os/Packages/n/numactl-libs-2.0.19-1.el9.x86_64.rpm
     repoid: rhel-9-for-x86_64-baseos-rpms
-    size: 31071
-    checksum: sha256:dcf66dcbdacd6d030f240de129ba1e939c30ed4217ccf40d36dcaebb3aa9e728
+    size: 33709
+    checksum: sha256:ce2f00b2527e29f6b389e5899750e2b6eb1e5ce484ddfdcd6f01fa311efe7860
     name: numactl-libs
-    evr: 2.0.19-3.el9
-    sourcerpm: numactl-2.0.19-3.el9.src.rpm
-  - url: https://cdn.redhat.com/content/dist/rhel9/9/x86_64/codeready-builder/os/Packages/l/libvirt-devel-11.10.0-12.3.el9_8.x86_64.rpm
+    evr: 2.0.19-1.el9
+    sourcerpm: numactl-2.0.19-1.el9.src.rpm
+  - url: https://cdn.redhat.com/content/dist/rhel9/9.6/x86_64/codeready-builder/os/Packages/l/libvirt-devel-10.10.0-7.7.el9_6.x86_64.rpm
     repoid: codeready-builder-for-rhel-9-x86_64-rpms
-    size: 234840
-    checksum: sha256:a750167a88c992447dc36208ad295e2a46fec7f59ef766e4474acd135b206003
+    size: 214197
+    checksum: sha256:47f8657312197e50d8da0e7584d4452c731d30c7e78974c44f7911a193fb3ad1
     name: libvirt-devel
-    evr: 11.10.0-12.3.el9_8
-    sourcerpm: libvirt-11.10.0-12.3.el9_8.src.rpm
+    evr: 10.10.0-7.7.el9_6
+    sourcerpm: libvirt-10.10.0-7.7.el9_6.src.rpm
   source: []
   module_metadata: []