From nobody Sun Sep 14 08:18:55 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=1757688309; cv=none; d=zohomail.com; s=zohoarc; b=imnKmYxrbon6j+MNJgvgjfNPJ6sFIC/bKmzOG34udCB9qYKp67lwuCVSk8eHPiUqvSOviaS1jM6CR3SUD2rU6zuSdzyrwt10Haegh1+J5LZgWEk7/NG3ulmqowN3zZAxPyFdgb6PPosh13xjZ3IrrzvIZPJbvnOqM9Ew/PUoUDs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1757688309; 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=4Fa1/s/Dy+cCaT7ztlJbT+Ce4uvv+WkjLn5aHmuIYYY=; b=W2UaNMqDwZ19QcgE31sLMXl/5IXk9+QKiwGuaZIuNzPQQ4Bf60gXYnLTVmfg3Xq+Js/RktH907uDOZvyBSCuCFOwDgIsiWPSG8h2hOpDSeKSjS8R2CMEXBwzQSWeFM7rQomdyYkCuV2opK+BVn99bcCzUGkx8Lr0JyaK9E3Ycak= 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 1757688309344154.170316936336; Fri, 12 Sep 2025 07:45:09 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1122093.1466037 (Exim 4.92) (envelope-from ) id 1ux50y-0005rY-W5; Fri, 12 Sep 2025 14:44:40 +0000 Received: by outflank-mailman (output) from mailman id 1122093.1466037; Fri, 12 Sep 2025 14:44:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ux50y-0005qr-OZ; Fri, 12 Sep 2025 14:44:40 +0000 Received: by outflank-mailman (input) for mailman id 1122093; Fri, 12 Sep 2025 14:44:39 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1ux50x-0004JT-43 for xen-devel@lists.xenproject.org; Fri, 12 Sep 2025 14:44:39 +0000 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [2a00:1450:4864:20::42c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 0217de34-8fe7-11f0-9d13-b5c5bf9af7f9; Fri, 12 Sep 2025 16:44:38 +0200 (CEST) Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-3e76766a172so679631f8f.0 for ; Fri, 12 Sep 2025 07:44:38 -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-45e015784c3sm72070045e9.10.2025.09.12.07.44.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Sep 2025 07:44:37 -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: 0217de34-8fe7-11f0-9d13-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1757688278; x=1758293078; 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=4Fa1/s/Dy+cCaT7ztlJbT+Ce4uvv+WkjLn5aHmuIYYY=; b=hRdj06IgGlpYshAXMEJm4k+gqOjvypN1yQqao7oJxeTemST445uAZRJguP2Ue/VdNw vhHwl8LH4nbk8n5W4Br93ODle4JOh1mlsgg+w9Vbjn9mFnQ1uB3X/T7kblH8FjnQvS0G E1C/ccq1RRlGsj8suQMoF0SmuGB8zXEUlVY8M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757688278; x=1758293078; 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=4Fa1/s/Dy+cCaT7ztlJbT+Ce4uvv+WkjLn5aHmuIYYY=; b=rzb5QwxGD507d7YT+X39SE8dVxOWSP50EQ5w7x+5x8NWY3yHy5vdFE/Cm7JXuGNn+A ZXER+Ew7HVqiNG7I92L8DVZ7EG2IF97x8Tu4Xfrrn7Wl1cfSqleb2CFprRp7xBr4IPoG WAMnDqzYox1KuPnPzyolLkKKCz1W2sAFMK+2Ce9adfKHmtKr+37NRbLX3+Z46j+FUx0S txQdtHhkV25Y9WULmLLVSOErrWTIQx8BXtrxFr9g16OzROylo8P5aWZqX+Bsx1TlIAtE H7jfrkDR71Xmn9gNT4iy0UYBykHF9C9NCIbczjOysCKIHPge6TxsidDzswqSYivcfmRG xeaw== X-Gm-Message-State: AOJu0YzB7ubfZaohMi0JGS0aWdSgNkz/vTB3hG6zRQ1uliqrL6W1AAC/ tjTDYyi3R9QMo2zOn8klVeBRkM/prjbCNGFrzuQeeXa0z4FZrrRqX4poVZqULlPZlF0TnzHbjAg qUIKG X-Gm-Gg: ASbGncsGyz/hD5chJoFSeCatm4iq9brUkU+mP0FeFiuHKch+1fCyOm3DClxGgRa1t1X Q4Tn9fO2A64AtA2FaJMoJy7DoYu8Xljjl+4FGS4yt940lLMYShV0+IpPITJGi+7A9M8988TtH9f OrEsoGsc4f+FyVAZ1d52gwJTAapI28/0BI9VSmlFAnMLA8+E6ESBUFNAoHa/a3XwzvpgAdZjr8Z JoJk+r1YvLoHSzVR3zBZ17fCQ9XG/Ml22CNhe3hOjzwMhT7e783MUOpxCO6Yi1OuqVo2XvtUPO+ rpORySiFxxE2G1RQA1N6Jh4ugPxSLVOfWn7xQEluAuLXVgtWNo+qQeNoGXtdb8l7NPRJuejoZt9 PH5WtgJkeYab1Z1nYQk1xZgTFKyc29JMJdeKoz48/DLgxK0y6B3wDOcAAx9+t07izmd+rXyZqm6 P1 X-Google-Smtp-Source: AGHT+IFtxjvc/nwlNgff2Wk70EZffbLeEHdBX9p4nUZmKLib84yJUpcgSHaEkkPdbPVwfWrdywmapw== X-Received: by 2002:a05:6000:4023:b0:3e2:4a3e:d3ee with SMTP id ffacd0b85a97d-3e765a14133mr2670234f8f.58.1757688277654; Fri, 12 Sep 2025 07:44:37 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Denis Mukhin , 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 v4 7/8] CI: Update x86 to use Debian Trixie Date: Fri, 12 Sep 2025 15:44:26 +0100 Message-Id: <20250912144427.1905141-8-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250912144427.1905141-1-andrew.cooper3@citrix.com> References: <20250912144427.1905141-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: 1757688310584116600 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 447152d7e5e4..464b4fc55e38 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