From 4f35220a2459fa3e5f20fa9c2bf4a5dddf1a621e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 14 Jul 2026 11:17:19 +0200 Subject: [PATCH] versions: trim unused asset and hypervisor metadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop uscan-only fields, duplicate qemu.tag, and unused image/initrd URLs from versions.yaml, and teach gen_versions_txt to treat qemu.version as either a branch or tag ref. Signed-off-by: Fabiano FidĂȘncio --- tools/packaging/scripts/gen_versions_txt.sh | 3 +-- versions.yaml | 17 ----------------- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/tools/packaging/scripts/gen_versions_txt.sh b/tools/packaging/scripts/gen_versions_txt.sh index 9fb90e6672..80253444a6 100755 --- a/tools/packaging/scripts/gen_versions_txt.sh +++ b/tools/packaging/scripts/gen_versions_txt.sh @@ -41,10 +41,9 @@ gen_version_file() { fi qemu_vanilla_branch=$(get_from_kata_deps ".assets.hypervisor.qemu.version") - # Check if qemu.version can be used to get the version and hash, otherwise use qemu.tag + # Use version as a branch ref when it exists, otherwise treat it as a tag. qemu_vanilla_ref="refs/heads/${qemu_vanilla_branch}" if ! (git ls-remote --heads "https://github.com/qemu/qemu.git" | grep -q "refs/heads/${qemu_vanilla_branch}"); then - qemu_vanilla_branch=$(get_from_kata_deps ".assets.hypervisor.qemu.tag") qemu_vanilla_ref="refs/tags/${qemu_vanilla_branch}^{}" fi qemu_vanilla_version=$(curl -s -L "https://raw.githubusercontent.com/qemu/qemu/${qemu_vanilla_branch}/VERSION") diff --git a/versions.yaml b/versions.yaml index b1614f9eb2..98921cf3cc 100644 --- a/versions.yaml +++ b/versions.yaml @@ -73,31 +73,17 @@ assets: cloud_hypervisor: description: "Cloud Hypervisor is an open source Virtual Machine Monitor" url: "https://github.com/cloud-hypervisor/cloud-hypervisor" - uscan-url: >- - https://github.com/cloud-hypervisor/cloud-hypervisor/tags.*/v?(\d\S+)\.tar\.gz version: "v51.1" firecracker: description: "Firecracker micro-VMM" url: "https://github.com/firecracker-microvm/firecracker" - uscan-url: >- - https://github.com/firecracker-microvm/firecracker/tags - .*/v?(\d\S+)\.tar\.gz version: "v1.12.1" qemu: description: "VMM that uses KVM" url: "https://github.com/qemu/qemu" version: "v11.0.1" - tag: "v11.0.1" - # Do not include any non-full release versions - # Break the line *without CR or space being appended*, to appease - # yamllint, and note the deliberate ' ' at the end of the expression. - uscan-opts: "opts=uversionmangle=s/(\\d)[_\\.\\-\\+]?\ - ((RC|rc|pre|dev|beta|alpha)\\d*)$/$1~$2/ " - uscan-url: >- - https://github.com/qemu/qemu/tags - .*/v?(\d\S+)\.tar\.gz qemu-cca-experimental: description: "QEMU with experimental CCA support" @@ -123,7 +109,6 @@ assets: description: | Root filesystem disk image used to boot the guest virtual machine. - url: "https://github.com/kata-containers/kata-containers/tools/osbuilder" architecture: aarch64: name: "ubuntu" @@ -178,7 +163,6 @@ assets: description: | Root filesystem initrd used to boot the guest virtual machine. - url: "https://github.com/kata-containers/kata-containers/tools/osbuilder" architecture: aarch64: name: "ubuntu" @@ -221,7 +205,6 @@ assets: url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/" version: "v6.18.35" nvidia: - description: "Linux kernel optimised for virtual machines" url: "https://cdn.kernel.org/pub/linux/kernel/v6.x/" version: "v6.18.35"