Merge pull request #13377 from fidencio/topic/fix-qemu-vm-templating-alpine-initrd

packaging: use Ubuntu noble for vanilla guest initrd
This commit is contained in:
Fabiano Fidêncio
2026-07-15 17:11:57 +02:00
committed by GitHub
2 changed files with 6 additions and 8 deletions

View File

@@ -829,10 +829,8 @@ install_initrd() {
export PAUSE_IMAGE_TARBALL
fi
else
# No variant is passed, it means vanilla kata containers
if [[ "${os_name}" = "alpine" ]]; then
export AGENT_INIT=yes
fi
# Vanilla initrd uses kata-agent as /sbin/init (no systemd).
export AGENT_INIT=yes
fi
AGENT_TARBALL=$(get_agent_tarball_path)

View File

@@ -181,8 +181,8 @@ assets:
url: "https://github.com/kata-containers/kata-containers/tools/osbuilder"
architecture:
aarch64:
name: "alpine"
version: "3.22"
name: "ubuntu"
version: "noble" # 24.04 LTS
confidential:
name: "ubuntu"
version: "noble" # 24.04 LTS
@@ -204,8 +204,8 @@ assets:
name: "ubuntu"
version: "noble" # 24.04 LTS
x86_64:
name: "alpine"
version: "3.22"
name: "ubuntu"
version: "noble" # 24.04 LTS
confidential:
name: "ubuntu"
version: "noble" # 24.04 LTS