From patchwork Mon Jul 8 17:35:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13726929 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D3F9FC3271E for ; Mon, 8 Jul 2024 17:35:41 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.755531.1163927 (Exim 4.92) (envelope-from ) id 1sQsGx-0000W5-KU; Mon, 08 Jul 2024 17:35:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 755531.1163927; Mon, 08 Jul 2024 17:35:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sQsGx-0000Vy-G7; Mon, 08 Jul 2024 17:35:31 +0000 Received: by outflank-mailman (input) for mailman id 755531; Mon, 08 Jul 2024 17:35:30 +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 1sQsGw-0000H0-78 for xen-devel@lists.xenproject.org; Mon, 08 Jul 2024 17:35:30 +0000 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [2a00:1450:4864:20::52d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 775a3695-3d50-11ef-8776-851b0ebba9a2; Mon, 08 Jul 2024 19:35:28 +0200 (CEST) Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-57cc1c00ba6so5674290a12.1 for ; Mon, 08 Jul 2024 10:35:28 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6bc88csm11603666b.6.2024.07.08.10.35.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 10:35:25 -0700 (PDT) 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: 775a3695-3d50-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720460126; x=1721064926; 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=epcQlWhE08mmo18Ou0eUa+ySD6kZjdPGssgvvnX14vM=; b=CQj1Zig1rku/JKCKrmi3PcEl8V8u70Pg+3MLnrdPc8WSIpnXJfIwfy0WrwDGtWThDP KWkuh7cNh7bikwY/dzsdMqxbPlRwOpBit2h6PovZQBNfNOJmpE8k6vZ5yxLV0ePnZG8l +pAzsALKx0WFWcrKk41R/TtRIjrVaQUt9Hvgc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720460126; x=1721064926; 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=epcQlWhE08mmo18Ou0eUa+ySD6kZjdPGssgvvnX14vM=; b=RVolCbX4DDNEmGutX4S8J1z2t0fjtyAXBio6ZZsVsYuETfJgC5utSUEHZs3xPlNiYu cABU9KaAQrsxCAtEyp6c5JQvV+ZDXvK+V4JQLgJ4Ef8P8PXDZJhKjBhi4HeWCYeU7GPj dav3YeVi6gXuOr+82PKomcmI8zLiAqdphfyHv6lQTpgeVbXS1oI3nCkRLBFFlKd3N+Ij b2QCVE1V89FCz0PtzkytPjwPB22K7VM6GAB9EPg8FrK4jvZu7cZUWyZtYc10R1re5kkb tGU+99DgJvjjAr/0SZ5Il11m3Tf1I+RmLH196pyjrc/jZNaMSul3WY2Zy+u97liuIjFH j2Yw== X-Gm-Message-State: AOJu0YwNmGAqspYsBytsPBAFf/pDC9rBWGdpgRG9LFh/iSsBzCzJtVSM dbbu+OhlXk1zb+/ypCeawvVvCpx73GxpD7FdYuHcGo1O28L/Y2Z9S8Jm+EGIW3+sMj65TkD3R0h p X-Google-Smtp-Source: AGHT+IFI2/gBtGpBbyGt3lCYXWmf0QYtt4N0rNJ3xsNz0sosJ5NN+JTGmFARbLqHfD2RQ7GMMLlD1A== X-Received: by 2002:a17:906:f0cc:b0:a6f:e819:da9c with SMTP id a640c23a62f3a-a780b70539bmr19110566b.43.1720460126307; Mon, 08 Jul 2024 10:35:26 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 1/4] CI: Fix CONTAINER_UID0=1 scripts/containerize Date: Mon, 8 Jul 2024 18:35:19 +0100 Message-Id: <20240708173522.2218293-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240708173522.2218293-1-andrew.cooper3@citrix.com> References: <20240708173522.2218293-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Right now, most build containers use root. Archlinux, Fedora and Yocto set up a regular user called `user`. For those containers, trying to containerize as root fails, because CONTAINER_UID0=1 does nothing, whereas CONTAINER_UID0=0 forces the user away from root. To make CONTAINER_UID0=1 work reliably, force to root if requested. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- automation/scripts/containerize | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/containerize b/automation/scripts/containerize index acdef1b54813..03bc4837350c 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -51,7 +51,7 @@ esac # Use this variable to control whether root should be used case "_${CONTAINER_UID0}" in - _1) userarg= ;; + _1) userarg="-u 0" ;; _0|_) userarg="-u $(id -u) $userns_podman" ;; esac From patchwork Mon Jul 8 17:35:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13726933 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 26AC8C41513 for ; Mon, 8 Jul 2024 17:35:42 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.755532.1163936 (Exim 4.92) (envelope-from ) id 1sQsGy-0000kY-Qx; Mon, 08 Jul 2024 17:35:32 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 755532.1163936; Mon, 08 Jul 2024 17:35:32 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sQsGy-0000kR-NR; Mon, 08 Jul 2024 17:35:32 +0000 Received: by outflank-mailman (input) for mailman id 755532; Mon, 08 Jul 2024 17:35:31 +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 1sQsGx-0000H0-A9 for xen-devel@lists.xenproject.org; Mon, 08 Jul 2024 17:35:31 +0000 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [2a00:1450:4864:20::529]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 784d22d8-3d50-11ef-8776-851b0ebba9a2; Mon, 08 Jul 2024 19:35:29 +0200 (CEST) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-58b0beaf703so5151328a12.2 for ; Mon, 08 Jul 2024 10:35:29 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6bc88csm11603666b.6.2024.07.08.10.35.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 10:35:26 -0700 (PDT) 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: 784d22d8-3d50-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720460128; x=1721064928; 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=CJtHp8tty+WfmySIL4PeN7k5ySN/iHKXnLF29O6pnIA=; b=tEr8w8Rl1fkvSq15h6XIn191Ql3TNV4W0NGd1+N+bVMd03s6uDgU4QaPKNAE6zEjiu FQFXeLHAgtfCpOF/krw6DiPT3brAY2YPYW9DgrZCs7GM7T96qn1oA3SRCP6Ydexn2Ucn EcEtGRPq8fJ4O4A15IckAAQT28uo8rI85zn8A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720460128; x=1721064928; 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=CJtHp8tty+WfmySIL4PeN7k5ySN/iHKXnLF29O6pnIA=; b=MkD3nice0Bv1LnQoleaSVxGkJmxc87io/CZJdfVg4Wcp7T0ONU35cI2HYPjunYF6U/ 2mWCci+7ZZFptMylIDkFEUBTyV3WtIW61QejS4vadCk7YFDeaCblTHY8whhDCdVZdr8t fT2RC+QMP4zRSTvgYP1nM0BOTXuMxESF78LMSM/MZyycGgbzo9iBig6u4A80TkHODmnq 4ba2y58gYdTexXmwaaujAreZiJqalU/6Dj6ISED01/rIQjbAwXWslKBwP05fQ057qBCH K3rtuZ2DgFuAxiGoE9ae1lO7gP5iIZL4pMGPCsxpekiUib1u1Wm6Hg4se9akeTBM82wB RVNw== X-Gm-Message-State: AOJu0YzGE14yFCEu5/Bn7h1R2cY1qKCojFkFbkuOzp1DO4O56cq+8xKx zmSRPA77AS4U2VxRZeVCOubdrCPJ3okyKWK89BiGARxsX8K6j0TcPB3LBUJ8u02FHey9guGMsNV e X-Google-Smtp-Source: AGHT+IEp6SakYHeFlq+Wp72AMR6eVquB3HsAWqTGw08a9A4aDUOHHDpeQ93cPOmWy+VfNMg+aDIn8Q== X-Received: by 2002:a17:907:2d87:b0:a77:f5ca:f847 with SMTP id a640c23a62f3a-a780b68a20emr25931366b.3.1720460128495; Mon, 08 Jul 2024 10:35:28 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 2/4] CI: Introduce a bookworm-ppc64le container Date: Mon, 8 Jul 2024 18:35:20 +0100 Message-Id: <20240708173522.2218293-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240708173522.2218293-1-andrew.cooper3@citrix.com> References: <20240708173522.2218293-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Make it non-root by default, and set XEN_TARGET_ARCH=ppc64 too. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- .../build/debian/bookworm-ppc64le.dockerfile | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 automation/build/debian/bookworm-ppc64le.dockerfile diff --git a/automation/build/debian/bookworm-ppc64le.dockerfile b/automation/build/debian/bookworm-ppc64le.dockerfile new file mode 100644 index 000000000000..3b311e675ef5 --- /dev/null +++ b/automation/build/debian/bookworm-ppc64le.dockerfile @@ -0,0 +1,36 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 debian:bookworm-slim +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV CROSS_COMPILE=powerpc64le-linux-gnu- +ENV XEN_TARGET_ARCH=ppc64 + +RUN < X-Patchwork-Id: 13726930 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 23DCDC3DA42 for ; Mon, 8 Jul 2024 17:35:42 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.755533.1163946 (Exim 4.92) (envelope-from ) id 1sQsH0-00010A-5S; Mon, 08 Jul 2024 17:35:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 755533.1163946; Mon, 08 Jul 2024 17:35:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sQsH0-0000zs-2h; Mon, 08 Jul 2024 17:35:34 +0000 Received: by outflank-mailman (input) for mailman id 755533; Mon, 08 Jul 2024 17:35:32 +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 1sQsGy-0000H0-Qd for xen-devel@lists.xenproject.org; Mon, 08 Jul 2024 17:35:32 +0000 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [2a00:1450:4864:20::62d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 79167797-3d50-11ef-8776-851b0ebba9a2; Mon, 08 Jul 2024 19:35:31 +0200 (CEST) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a77abe5c709so525689066b.2 for ; Mon, 08 Jul 2024 10:35:31 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6bc88csm11603666b.6.2024.07.08.10.35.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 10:35:28 -0700 (PDT) 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: 79167797-3d50-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720460130; x=1721064930; 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=jFhtWu/TJjeZ9/+nBiaknK8ozkp9Tho9YIR3RqITO48=; b=q341IblXkaYRU7kCR8IIurk/Yzz+HL5YdUTmov2YkP0pBGZOidUeRt4NoWOgUMyOAb e06+yHt2xTHGBpqPBDjhl39knLGsABuRTayzukp8AWuvdQjd0kIqh6iPiTOuT7mz54j7 YfkoEhSMekmjklVLp3ow5Z7OuRL4BR0SThcSA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720460130; x=1721064930; 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=jFhtWu/TJjeZ9/+nBiaknK8ozkp9Tho9YIR3RqITO48=; b=GdgI5ijxCbuGccLS0E+ph163yUY1VFBau0CFsMKuQSqFGHH/5b+/A1OL4/XSs8vzIw iX/CQo5RY8k/QRmPjRDmHWj/ivpLqz1qjliFk0CJULM3mWURkqqBiQnOb/HHHBv+Eehr LNum+jRnh6QYEjfbk+gb+la1eF9r4b46pPL5oVAMz7LEn/cOE5IES+NeNq35q2QjDScq G21auV/aNaX3hlp69+VdNM0icX7SEB1tCPCwWl2rU1t7JcQQ0jNx7Y3BJcxDnTEolr9q XNVKWB6cgqV11TdO4XldghB/wItRUU1ixSUZP7HujlR2jx/g4FS8kC39wCzTUOb6AcPj JbYg== X-Gm-Message-State: AOJu0YwJbTpDffKMzG7KyEJTKlm7so0zLaTpGQDNl4akhjogYDrYwiy6 kAsYA48LVoR+aY0VFi2XbtPXJodT5FuhO/6ynp7ZDwEVav+zUtu78EfRDoukfzbNDfD8dw7m2KL J X-Google-Smtp-Source: AGHT+IEmWNDp3WFROxGqbBL0aWS8u3xezMZt2Pd2cCrt0NrGrqwBZpZiN8vDjSXqYKg6A8hN0VFPDg== X-Received: by 2002:a17:907:7f20:b0:a77:e1fb:7dea with SMTP id a640c23a62f3a-a780b688767mr20751766b.2.1720460130210; Mon, 08 Jul 2024 10:35:30 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 3/4] CI: Use bookworm-ppc64le for both build and test Date: Mon, 8 Jul 2024 18:35:21 +0100 Message-Id: <20240708173522.2218293-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240708173522.2218293-1-andrew.cooper3@citrix.com> References: <20240708173522.2218293-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 qemu-system-ppc64/8.1.0-ppc64 was added because bullseye's Qemu didn't understand the powernv9 machine. However, bookworm's Qemu does, and this is preforable to maintaining a random build of Qemu ourselves. Add bookworm builds, and retain bullseye to keep our lower-bound toolchain testing. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- automation/gitlab-ci/build.yaml | 22 +++++++++-- automation/gitlab-ci/test.yaml | 3 +- automation/scripts/qemu-smoke-ppc64le.sh | 4 +- .../qemu-system-ppc64/8.1.0-ppc64.dockerfile | 38 ------------------- 4 files changed, 21 insertions(+), 46 deletions(-) delete mode 100644 automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index ff5c9055d1f0..d6da156a5c85 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -534,17 +534,17 @@ archlinux-current-gcc-riscv64-debug-randconfig: <<: *riscv-fixed-randconfig # Power cross-build -debian-bullseye-gcc-ppc64le: +debian-bookworm-gcc-ppc64le: extends: .gcc-ppc64le-cross-build variables: - CONTAINER: debian:bullseye-ppc64le + CONTAINER: debian:bookworm-ppc64le KBUILD_DEFCONFIG: ppc64_defconfig HYPERVISOR_ONLY: y -debian-bullseye-gcc-ppc64le-debug: +debian-bookworm-gcc-ppc64le-debug: extends: .gcc-ppc64le-cross-build-debug variables: - CONTAINER: debian:bullseye-ppc64le + CONTAINER: debian:bookworm-ppc64le KBUILD_DEFCONFIG: ppc64_defconfig HYPERVISOR_ONLY: y @@ -817,3 +817,17 @@ opensuse-tumbleweed-gcc-debug: variables: CONTAINER: suse:opensuse-tumbleweed allow_failure: true + +debian-bullseye-gcc-ppc64le: + extends: .gcc-ppc64le-cross-build + variables: + CONTAINER: debian:bullseye-ppc64le + KBUILD_DEFCONFIG: ppc64_defconfig + HYPERVISOR_ONLY: y + +debian-bullseye-gcc-ppc64le-debug: + extends: .gcc-ppc64le-cross-build-debug + variables: + CONTAINER: debian:bullseye-ppc64le + KBUILD_DEFCONFIG: ppc64_defconfig + HYPERVISOR_ONLY: y diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 898d2adc8c5b..479479f23f65 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -447,5 +447,4 @@ qemu-smoke-ppc64le-powernv9-gcc: script: - ./automation/scripts/qemu-smoke-ppc64le.sh powernv9 2>&1 | tee ${LOGFILE} needs: - - qemu-system-ppc64-8.1.0-ppc64-export - - debian-bullseye-gcc-ppc64le-debug + - debian-bookworm-gcc-ppc64le-debug diff --git a/automation/scripts/qemu-smoke-ppc64le.sh b/automation/scripts/qemu-smoke-ppc64le.sh index 701d81107d18..9088881b731b 100755 --- a/automation/scripts/qemu-smoke-ppc64le.sh +++ b/automation/scripts/qemu-smoke-ppc64le.sh @@ -12,8 +12,8 @@ rm -f ${serial_log} set +e timeout -k 1 20 \ -binaries/qemu-system-ppc64 \ - -bios binaries/skiboot.lid \ +qemu-system-ppc64 \ + -bios skiboot.lid \ -M $machine \ -m 2g \ -smp 1 \ diff --git a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile deleted file mode 100644 index e28d68649239..000000000000 --- a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# syntax=docker/dockerfile:1 -FROM --platform=linux/amd64 debian:bullseye-slim -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" - -ENV DEBIAN_FRONTEND=noninteractive -ENV QEMU_VERSION=8.1.0 -ENV USER root - -RUN mkdir /build -WORKDIR /build - -# build depends -RUN apt-get update && \ - apt-get --quiet --yes install \ - build-essential \ - curl \ - python3 \ - python3-pip \ - python3-elementpath \ - ninja-build \ - pkg-config \ - libglib2.0-dev \ - libpixman-1-dev \ - && \ - \ - curl -fsSLO https://download.qemu.org/qemu-"$QEMU_VERSION".tar.xz && \ - tar xvJf qemu-"$QEMU_VERSION".tar.xz && \ - cd qemu-"$QEMU_VERSION" && \ - ./configure --target-list=ppc64-softmmu && \ - make -j$(nproc) && \ - cp ./build/qemu-system-ppc64 / && \ - cp ./build/qemu-bundle/usr/local/share/qemu/skiboot.lid / && \ - cd /build && \ - rm -rf qemu-"$QEMU_VERSION"* && \ - apt-get autoremove -y && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists* /tmp/* /var/tmp/* From patchwork Mon Jul 8 17:35:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13726931 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0D364C3DA4A for ; Mon, 8 Jul 2024 17:35:43 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.755534.1163956 (Exim 4.92) (envelope-from ) id 1sQsH1-0001Gc-DT; Mon, 08 Jul 2024 17:35:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 755534.1163956; Mon, 08 Jul 2024 17:35:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sQsH1-0001GM-9I; Mon, 08 Jul 2024 17:35:35 +0000 Received: by outflank-mailman (input) for mailman id 755534; Mon, 08 Jul 2024 17:35:33 +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 1sQsGz-0000H0-Ru for xen-devel@lists.xenproject.org; Mon, 08 Jul 2024 17:35:33 +0000 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [2a00:1450:4864:20::632]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 79c8dabd-3d50-11ef-8776-851b0ebba9a2; Mon, 08 Jul 2024 19:35:32 +0200 (CEST) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a77e392f59fso247507366b.1 for ; Mon, 08 Jul 2024 10:35:32 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a780a6bc88csm11603666b.6.2024.07.08.10.35.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Jul 2024 10:35:30 -0700 (PDT) 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: 79c8dabd-3d50-11ef-8776-851b0ebba9a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720460131; x=1721064931; 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=i4f91M354fClKBK9C+cxTehpG9qrbHFjq1S8H6hQbys=; b=tVritn+RvjUsNhvClXDkQ6ROulqzfl0Y4d2wh6AwF+2uU8drb8yhNNG7sSoc00XiDz 0MYv4j4O5VlC9OVf0dcHpLGYEiNMVbsDxJHU0wBszN5L9+c+nXaThmppqeIxL3AYv/ZA W7VT9bTwpy82hbuueuyfSpsGfZf2pjf0EOEIg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720460131; x=1721064931; 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=i4f91M354fClKBK9C+cxTehpG9qrbHFjq1S8H6hQbys=; b=sULG/8y1HE5X8oa9ogD/mx11J4vjo3k4Gc0cyGU3ieGhkZs4ZS1kXvvDkCkKCz9VEh 1o2RL+tkKz69GbmgRv3q7trYBrF+QWuBUkAyh9WGUnWqDOplcizVlnDkZlEmPXjoZcYf GroNOUKgZdgZZHo/LXqWmytFqeryJBmynMJc2m5Rrx85hPgRm9qFfExzVK5OEH/VEt4q pb8qMFLb+Y2w8Ohz7vOHzjXEU3qa8hQs3kgvDBycffCy3jdIwma52e/2nT5vxPokrIGX CASisbHrTRpUPdM+jyXyN5v4r7J8bDXZDQ9aM7TPElUuDWBMEIAk4itpCSyzW4uZRudF Rftg== X-Gm-Message-State: AOJu0YxF1/ppJr1xtDw5JPfH9gpUkjRgI+Br5SvPyoftYp22PST9S9zM JsWERLdmYDSSlFeEE2QQdA86XUiWM93HJ7IqZE0kha07en46O6GsdBt+Mjiyuj2iDhZ6XHhyMnw / X-Google-Smtp-Source: AGHT+IFZ7UULz4vxUyzkyIdVvhbt8bqRPpmCAPXGYYcuy6YcYeiqwPUEs6VBH9SOOPgLgxPPZaIEsQ== X-Received: by 2002:a17:906:4ed6:b0:a77:c199:9cfc with SMTP id a640c23a62f3a-a780b8856e6mr15951166b.57.1720460131453; Mon, 08 Jul 2024 10:35:31 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH 4/4] CI: Refresh bullseye-ppc64le Date: Mon, 8 Jul 2024 18:35:22 +0100 Message-Id: <20240708173522.2218293-5-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240708173522.2218293-1-andrew.cooper3@citrix.com> References: <20240708173522.2218293-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 ... in the style of bookworm-ppc64le Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio --- .../build/debian/bullseye-ppc64le.dockerfile | 51 ++++++++++--------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile b/automation/build/debian/bullseye-ppc64le.dockerfile index e166d205f38c..d846b670d02c 100644 --- a/automation/build/debian/bullseye-ppc64le.dockerfile +++ b/automation/build/debian/bullseye-ppc64le.dockerfile @@ -1,32 +1,33 @@ # syntax=docker/dockerfile:1 FROM --platform=linux/amd64 debian:bullseye-slim -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@lists.xenproject.org" +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" ENV DEBIAN_FRONTEND=noninteractive -ENV USER root +ENV CROSS_COMPILE=powerpc64le-linux-gnu- +ENV XEN_TARGET_ARCH=ppc64 -# Add compiler path -ENV CROSS_COMPILE powerpc64le-linux-gnu- +RUN <