From patchwork Fri Oct 11 01:01:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13831715 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 06FF95256 for ; Fri, 11 Oct 2024 01:01:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728608475; cv=none; b=iAUgw3LI6/8x9ghpMikijgASmEISGceOCfy9rLpCmS0xFd1+JuCam4wLLQRjj0vOW0CUE5na8GaHjaOkYWyWgo1bfLkELrRL9Wm91vwC/rTQxndHpy4Fbl/RMKZrc/1JffK2K3+oTaD5mhtY2TGJFNBv7rlXjVTkS03X84nR4F8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728608475; c=relaxed/simple; bh=2R5yklc6V9JI78WQN3YdU9VN+t0/IqMQm5XCVfbYdrk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E2SpmzIaswZoENDLROLkpL+aDj0EmyI5H5+Dx+Ke1qnUwqnTtbTjbag/eyefnmWgpBnJfBPsxycrwJR6QsIehombOG70n9llEa1ET3DDQEvkWgTnf2bpjpYIHZ2+5Z/pmEm7C+s+7eIA70TyXSDikzlVkKe6Un9X39Fu3qAex8w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=HGDBMlI/; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="HGDBMlI/" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=3M1fXIqrGAdTXZQyuQv87K3v/ySmmLAvo8gMTRimRG4=; b=HGDBMlI/eN+bBuV5ofaoNYCn4c qVxLPE8spd6P3PHQ5ND+k4CUBR6CZ3+Y72TJnTJVuzWpfPFNFKhHXXF4cCoLQKIu91R0si+4AmxgS IMXUN26/hrXbX17ERQnKGLhgep6pD0RYuFHsXX0p+W9f4adM4tZAry39N2KIqIJaMa4HDtq1rkgPZ Grrx3F4V/UZIc82N5uTPMs/tUcARExLYVo+/ldJBYN+JaZWbEn/bj/0x37/GQvOhPy2nC/CPyYRAz kce7fKPB42xpQ3IAx+IIKZfYxzJBJjTA/Zwmqm84aJxhY6qrUY3/c6uzcnOBkfoZfk6Ihrp3G+UkP 0YAF3j+w==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1sz41o-0000000ErxK-1guq; Fri, 11 Oct 2024 01:01:12 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev, ross@kallisti.us Cc: mcgrof@kernel.org Subject: [PATCH kdevops 1/4] guestfs: make trixie generic image the default Date: Thu, 10 Oct 2024 18:01:08 -0700 Message-ID: <20241011010111.3543993-2-mcgrof@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241011010111.3543993-1-mcgrof@kernel.org> References: <20241011010111.3543993-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sender: Luis Chamberlain The cloud image lacks 9p fs support so can't be used for kernel hacking on kdevops unless you don't want to use 9p fs.. So while at it codify all this by disabling bootlinux 9p support if the user selects that image. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.guestfs | 14 ++++++++++++-- workflows/linux/Kconfig | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs index 742781abcddc..da2f5e3961d7 100644 --- a/kconfigs/Kconfig.guestfs +++ b/kconfigs/Kconfig.guestfs @@ -10,6 +10,9 @@ config GUESTFS_REQUIRES_UEFI bool output yaml +config GUESTFS_LACKS_9P + bool + config GUESTFS_CUSTOM_RAW_IMAGE_URL depends on GUESTFS_HAS_CUSTOM_RAW_IMAGE depends on GUESTFS_HAS_CUSTOM_RAW_IMAGE_URL @@ -111,19 +114,26 @@ if GUESTFS_DEBIAN_TRIXIE choice prompt "Debian trixie flavor" - default GUESTFS_DEBIAN_TRIXIE_GENERIC_CLOUD_AMD64 + default GUESTFS_DEBIAN_TRIXIE_GENERIC_AMD64 config GUESTFS_DEBIAN_TRIXIE_GENERIC_AMD64 bool "debian-13-generic-amd64-daily" help Should run in any environment using cloud-init, for e.g. OpenStack, - DigitalOcean and also on bare metal. + DigitalOcean and also on bare metal. This is the image you should + try to use and stick to for kernel testing. config GUESTFS_DEBIAN_TRIXIE_GENERIC_CLOUD_AMD64 bool "debian-13-genericcloud-amd64-daily" help Similar to generic. Should run in any virtualised environment. Is smaller than generic by excluding drivers for physical hardware. + Note that the 9p client filesystem module will not be available to + you with this image and so you cannot leverage 9p for building + Linux on the host. This image also requires a EFI boot loader + and secure boot is enabled by default which means your custom + kernels will need to be signed and this plumbing is not supported + yet so you are on your own. config GUESTFS_DEBIAN_TRIXIE_NOCLOUD_AMD64 bool "debian-13-nocloud-amd64-daily" diff --git a/workflows/linux/Kconfig b/workflows/linux/Kconfig index 8b1dfd3b25c7..b51d8ee3fb3d 100644 --- a/workflows/linux/Kconfig +++ b/workflows/linux/Kconfig @@ -38,7 +38,7 @@ endif # HAVE_SUPPORTS_PURE_IOMAP config BOOTLINUX_9P bool "Use 9p to build Linux" - depends on LIBVIRT + depends on LIBVIRT && !GUESTFS_LACKS_9P default LIBVIRT help This will let you choose use 9p to build Linux. What this does is From patchwork Fri Oct 11 01:01:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13831713 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8889522F for ; Fri, 11 Oct 2024 01:01:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728608474; cv=none; b=ZHw/8i8jYgVs6Leyx1ckH9ik6CSNsntfviRAfZyrF4CCkayVGEeUpg2ETiD3f6as8Eet72LXrBDf/OsDAXo5cj1f8QGAjoQ3uj5kNyvak01ghnRGhflzLFmW+Gp/W9pg3D7YWZXnDMmZXwgqbJdgSn1mCRLiWWpdeZSvfLIO+zg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728608474; c=relaxed/simple; bh=BpZsmb4itDXzZSqnKspZOxebV6hRdqkRM5qSmdwASEY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SM3o8epe/R+SV7HQW5GFHtqTvp8HbXL9f82AyO0g/IjhzFgh5mkKna2rcyPPTqisQ5xprvJFNR4rvbFuQSRdqNt7K+wte6EQ6i5LqoNng8z/rkUGWLwZ+XMgeIJUnmSPC6yIrfySNLkPbCPWyLRDcDd0fd4NXBRfwUtlmEczo1w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=vfAqwKgh; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="vfAqwKgh" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=x6UWNV4telymfGPxNvYxH+T32g+49aZ/qX0kqB/yCBg=; b=vfAqwKgheJ6MH148ddsNR5zujh W25ACw1LRC/hEaLB9L/mU1ra5LpKWUat16oLUnZWpkkc6kGtnp3M8fAVYpUtHY9nMGBLn99GZYbuq 0APtNYt9eMYCB3EUWqPqC513Q2pBYqSAXUGAMiVYeXBUWzMsTMhWstVhQEUEjEmKVanRnmeowWwUO Bif1Gun8UjCY1k9AhFaRjwv9W3uLj8E8BmPQIQYPP7mAkm3Gf2+Tx9ynJlc16ycCjzTB9/WCOyW1p 70q6w0cQDX54LaWtI+5jy2Zybqf7+qQ60PryUuHsUJCIE/tdw49AY3IZvQf/TT9paJUmfNBiHGHxL Kq0AejCQ==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1sz41o-0000000ErxM-1qUi; Fri, 11 Oct 2024 01:01:12 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev, ross@kallisti.us Cc: mcgrof@kernel.org Subject: [PATCH kdevops 2/4] guestfs: fix uefi boot for debian trixie Date: Thu, 10 Oct 2024 18:01:09 -0700 Message-ID: <20241011010111.3543993-3-mcgrof@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241011010111.3543993-1-mcgrof@kernel.org> References: <20241011010111.3543993-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sender: Luis Chamberlain When UEFI boot is needed on an image we should disable secure boot as we're doing kernel hacking and want to make kernel building and booting fast & furious. Doing kernel signing is tedious for CI testing of kernels when doing kernel hacking. If folks want to add support later for it, they can but let's not break kernel hacking. Without this we fail to boot custom kernels with: Bad shim signature The reason is secure boot is enabled. When readonly is not specified, the guest operating system may be able to modify the firmware during runtime. This is usually not desirable for UEFI binaries, so explicitly set readonly='yes' to protect the integrity of the firmware. Only debian trixie selects guestfs_requires_uefi so that's the only distribution we're fixing here. This should not regress anything otherwise. Signed-off-by: Luis Chamberlain --- playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml b/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml index dd2e7d39097c..adaba9188767 100644 --- a/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml +++ b/playbooks/roles/gen_nodes/templates/guestfs_q35.j2.xml @@ -6,7 +6,7 @@ {% if guestfs_requires_uefi %} hvm - + {% else %} From patchwork Fri Oct 11 01:01:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13831712 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C87FF4C7D for ; Fri, 11 Oct 2024 01:01:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728608474; cv=none; b=kW5ZB8PDZojT2OECfgtYO1EuMsRfW4o0r3QuVg7sRJczMZGlStCglJVQ0o4m402YXcaSC0v/mzYtNqh5yUUw8k4FpJH+GRFbPPuoila0FgvjRsb4icg1Mt5gI6dp28NZ5z9Z0nI5DRIVc912gui//Y3/holRUYrQmBb2h7//fH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728608474; c=relaxed/simple; bh=+fvrBG0sZIzHJfYiRMPKmiE+rdYKjbQIQ/09mC0HSRM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kjrsBZc9H6xkL85b7JH7Nivl2hs52hkswcZp9gwvbuCn6Tv9R7M/XVp+zCcPctdceccXLAd5VIpBYXL6kNwd3IoLTKVMSq/I8zCw9nBeY0ErQpW+Fm9BC2ipPZDshqhjFdbottV3MGPwsVScK3bgPBeL5EB0c0muTZlKHHr/6+Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=q0gjN7/G; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="q0gjN7/G" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=s8Ulqlz6OJ3GQ/lUoxVrbYF3DIrWT5+iTGX3syoZSBk=; b=q0gjN7/GHSsCUZ9ZFwt3w4HxCD VJrywdPBrV0JzzBLQRB2OtjRnhSaBhbWb5/YfJG0ijc6LVsfZhIHUQDvlPx8Qg6n/WDVxOCMRBWWN gD7wnYcAqABv6cGZQYFJCTRShiwhqVQ4Tipzj+ubFPViobGhok9qP2TR/8EgbLpkNOqw1ZmfkXygX lOs7N2pt2xrXNHlKbBxdR6A6nIDECGdK9OJ9VikWWR33rzWi4efnbk/0euTh8XRy/ioRgjEh7AHj0 5UmICyhoZDlesAvc9Hu24O45zCe7btCClbYFtdIFktN2rxq1DVexehyUxIBhyGmia5oocwNeMW2at axmcfS5w==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1sz41o-0000000ErxO-1zvI; Fri, 11 Oct 2024 01:01:12 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev, ross@kallisti.us Cc: mcgrof@kernel.org Subject: [PATCH kdevops 3/4] guestfs: fix trixie bringup Date: Thu, 10 Oct 2024 18:01:10 -0700 Message-ID: <20241011010111.3543993-4-mcgrof@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241011010111.3543993-1-mcgrof@kernel.org> References: <20241011010111.3543993-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sender: Luis Chamberlain We have a series of fixups needed to the default generic debian 13 trixie image: - kdevops has support for default heuristic when debian is detected on the host, and if your host has an /etc/apt/sources.list with a hop 1 to the servers, we infer that you are using a local mirror for debian. *If* the host and guest match distributions or at least we feel confident in the upgrade process (upgrading buster to trixie on the guest) then we by default enable leveraging the host's sources.list file onto the guest so the guest can also save bandwidth. This works nicely. However trixie uses an /etc/nsswitch.conf like this: files myhostname resolve [!UNAVAIL=return] dns This will prevent using dns from finding the 1 hop server on /etc/apt/sources.list. To fix this enable dns to be used for host son trixie. - cloud-init is not used by us and so we should just stop it, otherwise we may timeout on some random clout init guess work. - setup locales for LANG=en_US.UTF-8, we can later add variability if folks want it - restart ssh as in practice I've seen issues on bringup and timeouts - Be sure to remove the distro's /etc/apt/sources.list.d/debian.sources if CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST is enabled (as explained above). Signed-off-by: Luis Chamberlain --- scripts/bringup_guestfs.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh index d09ae64dcaea..16bfa7a6c805 100755 --- a/scripts/bringup_guestfs.sh +++ b/scripts/bringup_guestfs.sh @@ -233,6 +233,31 @@ firstboot-command systemctl stop ssh firstboot-command DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true dpkg-reconfigure -p low --force openssh-server firstboot-command systemctl start ssh _EOT + # CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST will not work + # if etc/nsswitch.conf has a line like this: + # + # hosts: files myhostname resolve [!UNAVAIL=return] dns + # + # We need DNS to be used so virb0 will be used for a DNS request + if [[ "$CONFIG_GUESTFS_DEBIAN_TRIXIE" == "y" ]]; then + cat <<_EOT >>$cmdfile +edit /etc/nsswitch.conf:'s/^hosts:.*UNAVAIL=return.*dns/hosts: files myhostname resolve dns/' +uninstall cloud-init +write /etc/default/locale:LANG=en_US.UTF-8 +append-line /etc/default/locale:LANGUAGE=en_US:en +write /etc/locale.gen:en_US.UTF-8 UTF-8 +firstboot-command locale-gen en_US.UTF-8 +firstboot-command update-locale LANG=en_US.UTF-8 +firstboot-command DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true dpkg-reconfigure -p low --force locales +firstboot-command systemctl stop ssh +firstboot-command systemctl start ssh +_EOT + if [[ "$CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST" == "y" ]]; then + cat <<_EOT >>$cmdfile +delete /etc/apt/sources.list.d/debian.sources +_EOT + fi + fi } USE_SUDO="" From patchwork Fri Oct 11 01:01:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13831711 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C88605228 for ; Fri, 11 Oct 2024 01:01:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728608474; cv=none; b=MMjDqdTOD7swXu7V/R4orUJRudSZ6Qnv4oAoVddkajV+4MT/rQ6QYwyIMa75Enwg2c8xMQDTX48oHUXfkJrjewzI9d9hJKROxhUE9c6YBoaZMAG7lQMxTwK2eykavIopEAkHy4HrKzrHmmm7sLx6g7SABAaRibL6u93p5gyfirA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728608474; c=relaxed/simple; bh=QaXbU8hqtY//ZpNEzzwvI6Ds3a3vxeuGcOwuLeySsYs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TlP87ptEyaRP40SKzbmdXFAomYfZ3dnN4myXMGRJMnbh/718dtPpXltAJLs6CMHAVT76HyNTGCG1fiLxa1PhYZupUFOex5WCykM+Um3Aeu5bMC9h0RM179GbaVlURKD/wgb2PQIlXVQ02/CezIK2SYsvqyEEDVKImqUqZTMV9X4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=mVAbqkMH; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=kernel.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="mVAbqkMH" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=NJdSmSAbhFCgV3ZvTcLXDgptWF0sayd8MkaLTKrHRDE=; b=mVAbqkMH4CpNTC8yna2JmgBXyr sQq093lPDOcKaWAIWZe16D1gHbz4qGPvtNlE0NH9w6G/cFqVCl+u4wiJewUyXD0AIAkjF4jsmw5GR s08ADwpXhJnkdc4E5zUUpOUWX3g/28tbUD15kNQh8yOWanR75gUgZ4z7Xt3Ih0uYWXt1OzbctO2+5 bEuwulwui4bRenA64yaYtXF2bsdMagDjCOgXB+5JCFwUsk/4V3bQuHueEYHHtrJx9v6OiL/NvtyIU okQb/g96jBNqYIngYASJQ9/suWsGKrAvxA4BVURDDS4/aEXYSmxxkTl02dogukdn7ik+bYAiYGfH0 k0ShVgCA==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.98 #2 (Red Hat Linux)) id 1sz41o-0000000ErxQ-2B3I; Fri, 11 Oct 2024 01:01:12 +0000 From: Luis Chamberlain To: kdevops@lists.linux.dev, ross@kallisti.us Cc: mcgrof@kernel.org Subject: [PATCH kdevops 4/4] guestfs: make debian trixie default Date: Thu, 10 Oct 2024 18:01:11 -0700 Message-ID: <20241011010111.3543993-5-mcgrof@kernel.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241011010111.3543993-1-mcgrof@kernel.org> References: <20241011010111.3543993-1-mcgrof@kernel.org> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Sender: Luis Chamberlain kdevops relies on rolling distributions. We've been stuck with debian12 because that's what the virt-builder servers have and it's a bit old for our taste in kernel hacking the latest and greatest kernels. Since we are now boosting efforts on CI kernel hacking testing, we want to make bringup as fast as possible, and since the first thing we typically want is the *latest and greatest* we tend to sometimes upgrade a system on bringup. Even if we skip that, buster 12 default is still a bit... old... and so to help speed up bringup in both cases where we just want the latest debian testing *or* an updated system, make debian 13 trixie the default image now that we've fixed it. Tested with: make linux make fstests And we've been running tests on guests where the host is trixie and the guest is debian 12 (buster) but then due to the host having a local apt mirror, we rely on CONFIG_GUESTFS_COPY_SOURCES_FROM_HOST_TO_GUEST to do immediately do upgrades from debian 12 --> debian 13. And debian 13 has been tested for many of our workflows including the latest sysbench workflow. So all in all, debian trixie has been being tested for a while, it was just this painful upgrade process we've had to deal with for a long time. Signed-off-by: Luis Chamberlain --- kconfigs/Kconfig.guestfs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kconfigs/Kconfig.guestfs b/kconfigs/Kconfig.guestfs index da2f5e3961d7..a804c8fce2fd 100644 --- a/kconfigs/Kconfig.guestfs +++ b/kconfigs/Kconfig.guestfs @@ -83,7 +83,7 @@ if GUESTFS_DEBIAN choice prompt "Debian version" - default GUESTFS_DEBIAN_BUSTER + default GUESTFS_DEBIAN_TRIXIE config GUESTFS_DEBIAN_TRIXIE bool "Debian 13 - Trixie"