From nobody Sun Sep 14 08:19:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1757632372; cv=none; d=zohomail.com; s=zohoarc; b=bh6edUIJDXOY2v2A8HnhyVB1Kuh2U0X6R13rZPq32RTIGj5VtCc099Z61o6XVIZwMlp2nsvD4h8OG1pTanWQXWGqajl+1i1Afma7NItUgJq9I6azc4ew8TvZ27zmrFjBax4zHbCiPZENN4h1vxZtps5kfG4fE8YYDh0HXjY9T2A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757632372; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GeLwzviMpfWDaMr+4cJyL8clwYsQTKK8d3VCevZ5LjE=; b=IxEV3L0Vq7KZytytdGPg0B8YYWOJ7cs0xtuM94rZCHeH644exWNFMYt6Fp1nkGLnoLZS7szhlUIpbFO+Zi0q+5hJ/BLRSA+3f5aNjIUWCqckf27C8/06J9fcPoYPShEEXlocxYPRFaZMqOxk/KA72U+0WBb2nRxWRdHC8MVE/UI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1757632372334429.57708135733674; Thu, 11 Sep 2025 16:12:52 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1121000.1465618 (Exim 4.92) (envelope-from ) id 1uwqSq-000827-76; Thu, 11 Sep 2025 23:12:28 +0000 Received: by outflank-mailman (output) from mailman id 1121000.1465618; Thu, 11 Sep 2025 23:12:28 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uwqSq-00080K-1a; Thu, 11 Sep 2025 23:12:28 +0000 Received: by outflank-mailman (input) for mailman id 1121000; Thu, 11 Sep 2025 23:12:26 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uwqSo-0007EP-Ly for xen-devel@lists.xenproject.org; Thu, 11 Sep 2025 23:12:26 +0000 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [2a00:1450:4864:20::435]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c705ed73-8f64-11f0-9809-7dc792cee155; Fri, 12 Sep 2025 01:12:24 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3dce6eed889so1194382f8f.0 for ; Thu, 11 Sep 2025 16:12:24 -0700 (PDT) Received: from localhost.localdomain (host-195-149-20-212.as13285.net. [195.149.20.212]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45e03729c76sm40014715e9.6.2025.09.11.16.12.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 16:12:23 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: c705ed73-8f64-11f0-9809-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1757632344; x=1758237144; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GeLwzviMpfWDaMr+4cJyL8clwYsQTKK8d3VCevZ5LjE=; b=ML4MkSgyHGC/sgYT6FLxg9VUW+zyXmpsJCd7UGbVyMDJOx6HSsIb/Sq18eSiD1xXGW mpR6Le4shfJ+W7ItvYBc+88myI4j7Z8vz0I5sOKuoCcQoR5u0ewxhMkyrv9anVfYf/WA q8ArHNNDmrnYFqGhjC/L2txr9PFmQOMSd0yrw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757632344; x=1758237144; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GeLwzviMpfWDaMr+4cJyL8clwYsQTKK8d3VCevZ5LjE=; b=Z3evbaNUvzOhSx/uUFJYVpPHsNYN2e4lkJshhDyjJsl0lVESmCl+Bs8s6ASAoU0/tV syF6rKG/mTFcQ2kPy6n+BS+NyMs+Bpz5kuyt/NDCXTQgPuwjlNb8Vt04OLmDxDP02USa VW5Jc89HNc87XOrAGsR/jCA4b4W4w1/vJVpsQOVTZzrNRg6HB5e4wZ4yJHDnr5j5WHfG l/klE3MoRFNI7/9C4OcBFG8GgmC8F3/sErm5P1eY9bllVsB8whbzx+4UwSsqEYsY6Bgz A3I+vfnHFJWExOkH2J39noegb2OAgtqYUU70Ur6TQ4EgGQvQZHuEGpuYxp03KyTl1l6C xqzA== X-Gm-Message-State: AOJu0YzZCx6g5RNEOoxu/QP72sYH0PxOrSMKoFlx6WGXSqziKwwbtd5v WtMMMAeYaJpX4k/B/tTMIoVLO6BPNYtmxDzHf2x1ixRoCaRDMuAZ/VCccWPCh6u4rw48JSoNM0l EoVBc X-Gm-Gg: ASbGncvvfI0tlNF1GB7C7P3y53q0A0BYOU1WeZIHEfZMyer2Xb0a4w5qu6HHWpxDTKx 4wQREVkDD4sMaTu5SNGujGweHE9SrY0xq/GESOlWu/3Idh12+WlzLc990EnC4akDi70LrzUdk/C 0bqH1+5z0rhzx1z2y6OrG6Wbs/6GbVePsmDac801Hpkv8/sxLgYi/UADZa+a8p9DapDfPY3pPzo OWrUSGgRUpUArpI3nCJf0lwLqVu0NfT4Pu/9MZuB/COI3K0s2DujFiqOs6SsNWox1nnWPxVOrRx EGRpF+nWNzgDBFAjD7m1PKbHn1Z/FwVWtrQQgU2mrDgaXyWb1HClbdmQxQqau5V6iiKCBLzK9tf LEoIOtbmOSBycfhdLpVtUaqxrv1kTL/VeE/hN0Wdio+M8ZDf0TYxPdGn0QAHbhLpGpAJNdQc3ok qwLjxhFMjGuOg= X-Google-Smtp-Source: AGHT+IFX23G7QN0g3dE2sYV/MnY6dXS7qgjlt2Aw6ZFq9rRDcdGw2dFEWCLCyJHH/WZaILosgsFjww== X-Received: by 2002:a05:6000:40c9:b0:3e7:42c5:ea46 with SMTP id ffacd0b85a97d-3e765a03801mr718781f8f.55.1757632343917; Thu, 11 Sep 2025 16:12:23 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Shawn Anastasio , Oleksii Kurochko , Doug Goldstein , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= , Victor Lira Subject: [PATCH v3 4/5] CI: Update x86 to use Debian Trixie Date: Fri, 12 Sep 2025 00:12:15 +0100 Message-Id: <20250911231216.1886818-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250911231216.1886818-1-andrew.cooper3@citrix.com> References: <20250911231216.1886818-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1757632374370116600 With the exception of the custom IBT job, copy all Debian 12 jobs making Debian 13 versions, then trim the Debian 12 ranconfig jobs. Update the test jobs using Debian 12 to use 13. Signed-off-by: Andrew Cooper Reviewed-by: Denis Mukhin --- CC: Anthony PERARD CC: Michal Orzel CC: Jan Beulich CC: Julien Grall CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Shawn Anastasio CC: Oleksii Kurochko CC: Doug Goldstein CC: Marek Marczykowski-G=C3=B3recki CC: Victor Lira v3: * Update .qemu-x86-64 too. * Rebase over cleanup to 12-x86_64 v2: * Make 13-x86_64 be root-less * Update containerize --- ...x86_32.dockerfile =3D> 13-x86_32.dockerfile} | 2 +- ...x86_64.dockerfile =3D> 13-x86_64.dockerfile} | 2 +- automation/gitlab-ci/build.yaml | 54 ++++++++++++++----- automation/gitlab-ci/test.yaml | 12 ++--- automation/scripts/containerize | 3 +- 5 files changed, 52 insertions(+), 21 deletions(-) copy automation/build/debian/{12-x86_32.dockerfile =3D> 13-x86_32.dockerfi= le} (95%) copy automation/build/debian/{12-x86_64.dockerfile =3D> 13-x86_64.dockerfi= le} (96%) diff --git a/automation/build/debian/12-x86_32.dockerfile b/automation/buil= d/debian/13-x86_32.dockerfile similarity index 95% copy from automation/build/debian/12-x86_32.dockerfile copy to automation/build/debian/13-x86_32.dockerfile index ef7a2571556b..2bd11af5a0c3 100644 --- a/automation/build/debian/12-x86_32.dockerfile +++ b/automation/build/debian/13-x86_32.dockerfile @@ -1,5 +1,5 @@ # syntax=3Ddocker/dockerfile:1 -FROM --platform=3Dlinux/i386 debian:bookworm +FROM --platform=3Dlinux/i386 debian:trixie-slim LABEL maintainer.name=3D"The Xen Project" LABEL maintainer.email=3D"xen-devel@lists.xenproject.org" =20 diff --git a/automation/build/debian/12-x86_64.dockerfile b/automation/buil= d/debian/13-x86_64.dockerfile similarity index 96% copy from automation/build/debian/12-x86_64.dockerfile copy to automation/build/debian/13-x86_64.dockerfile index 4e533ee879fd..2c6c9d4a5098 100644 --- a/automation/build/debian/12-x86_64.dockerfile +++ b/automation/build/debian/13-x86_64.dockerfile @@ -1,5 +1,5 @@ # syntax=3Ddocker/dockerfile:1 -FROM --platform=3Dlinux/amd64 debian:bookworm +FROM --platform=3Dlinux/amd64 debian:trixie-slim LABEL maintainer.name=3D"The Xen Project" LABEL maintainer.email=3D"xen-devel@lists.xenproject.org" =20 diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.y= aml index f8e45f3467c8..4cb52fe59715 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -309,15 +309,15 @@ alpine-3.18-gcc-debug: CONFIG_UCODE_SCAN_DEFAULT=3Dy CONFIG_XHCI=3Dy =20 -debian-12-x86_64-gcc-debug: +debian-13-x86_64-gcc-debug: extends: .gcc-x86-64-build-debug variables: - CONTAINER: debian:12-x86_64 + CONTAINER: debian:13-x86_64 =20 -debian-12-x86_64-clang-debug: +debian-13-x86_64-clang-debug: extends: .clang-x86-64-build-debug variables: - CONTAINER: debian:12-x86_64 + CONTAINER: debian:13-x86_64 =20 debian-13-ppc64le-gcc-debug: extends: .gcc-ppc64le-cross-build-debug @@ -545,24 +545,20 @@ debian-12-x86_64-clang: variables: CONTAINER: debian:12-x86_64 =20 -debian-12-x86_64-clang-randconfig: - extends: .clang-x86-64-build +debian-12-x86_64-clang-debug: + extends: .clang-x86-64-build-debug variables: CONTAINER: debian:12-x86_64 - RANDCONFIG: y - EXTRA_FIXED_RANDCONFIG: | - CONFIG_COVERAGE=3Dn # Disable coverage otherwise build times out. =20 debian-12-x86_64-gcc: extends: .gcc-x86-64-build variables: CONTAINER: debian:12-x86_64 =20 -debian-12-x86_64-gcc-randconfig: - extends: .gcc-x86-64-build +debian-12-x86_64-gcc-debug: + extends: .gcc-x86-64-build-debug variables: CONTAINER: debian:12-x86_64 - RANDCONFIG: y =20 debian-12-x86_32-clang-debug: extends: .clang-x86-32-build-debug @@ -574,6 +570,40 @@ debian-12-x86_32-gcc-debug: variables: CONTAINER: debian:12-x86_32 =20 +debian-13-x86_64-clang: + extends: .clang-x86-64-build + variables: + CONTAINER: debian:13-x86_64 + +debian-13-x86_64-clang-randconfig: + extends: .clang-x86-64-build + variables: + CONTAINER: debian:13-x86_64 + RANDCONFIG: y + EXTRA_FIXED_RANDCONFIG: | + CONFIG_COVERAGE=3Dn # Disable coverage otherwise build times out. + +debian-13-x86_64-gcc: + extends: .gcc-x86-64-build + variables: + CONTAINER: debian:13-x86_64 + +debian-13-x86_64-gcc-randconfig: + extends: .gcc-x86-64-build + variables: + CONTAINER: debian:13-x86_64 + RANDCONFIG: y + +debian-13-x86_32-clang-debug: + extends: .clang-x86-32-build-debug + variables: + CONTAINER: debian:13-x86_32 + +debian-13-x86_32-gcc-debug: + extends: .gcc-x86-32-build-debug + variables: + CONTAINER: debian:13-x86_32 + fedora-41-x86_64-gcc: extends: .gcc-x86-64-build variables: diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index e8946e15dc3a..8d8f62c8d04d 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -59,7 +59,7 @@ .qemu-x86-64: extends: .test-jobs-common variables: - CONTAINER: debian:12-x86_64 + CONTAINER: debian:13-x86_64 LOGFILE: qemu-smoke-x86-64.log artifacts: paths: @@ -661,35 +661,35 @@ qemu-smoke-x86-64-gcc: script: - ./automation/scripts/qemu-xtf.sh x86-64 pv64 example 2>&1 | tee ${LO= GFILE} needs: - - debian-12-x86_64-gcc-debug + - debian-13-x86_64-gcc-debug =20 qemu-smoke-x86-64-clang: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-xtf.sh x86-64 pv64 example 2>&1 | tee ${LO= GFILE} needs: - - debian-12-x86_64-clang-debug + - debian-13-x86_64-clang-debug =20 qemu-smoke-x86-64-gcc-pvh: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-xtf.sh x86-64 hvm64 example 2>&1 | tee ${L= OGFILE} needs: - - debian-12-x86_64-gcc-debug + - debian-13-x86_64-gcc-debug =20 qemu-smoke-x86-64-clang-pvh: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-xtf.sh x86-64 hvm64 example 2>&1 | tee ${L= OGFILE} needs: - - debian-12-x86_64-clang-debug + - debian-13-x86_64-clang-debug =20 qemu-smoke-x86-64-gcc-efi: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-xtf.sh x86-64-efi pv64 example 2>&1 | tee = ${LOGFILE} needs: - - debian-12-x86_64-gcc-debug + - debian-13-x86_64-gcc-debug =20 qemu-xtf-argo-x86_64-gcc-debug: extends: .qemu-smoke-x86-64 diff --git a/automation/scripts/containerize b/automation/scripts/container= ize index 65c8804ce5f3..743567cb772a 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -35,7 +35,8 @@ case "_${CONTAINER}" in _bookworm-riscv64) CONTAINER=3D"${BASE}/debian:12-riscv64" ;; _trixie-riscv64) CONTAINER=3D"${BASE}/debian:13-riscv64" ;; _bookworm-x86_64-gcc-ibt) CONTAINER=3D"${BASE}/debian:12-x86_64-gcc-ib= t" ;; - _bookworm|_bookworm-x86_64|_) CONTAINER=3D"${BASE}/debian:12-x86_64" ;; + _bookworm|_bookworm-x86_64) CONTAINER=3D"${BASE}/debian:12-x86_64" ;; + _trixie-x86_64|_) CONTAINER=3D"${BASE}/debian:13-x86_64" ;; _bookworm-i386|_bookworm-x86_32) CONTAINER=3D"${BASE}/debian:12-x86_32= " ;; _bookworm-arm64v8-arm32-gcc) CONTAINER=3D"${BASE}/debian:bookworm-arm6= 4v8-arm32-gcc" ;; _bookworm-arm64v8) CONTAINER=3D"${BASE}/debian:bookworm-arm64v8" ;; --=20 2.39.5