From patchwork Thu Oct 24 10:04:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javi Merino X-Patchwork-Id: 13848694 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 EFA46CFA462 for ; Thu, 24 Oct 2024 10:04:55 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.825099.1239303 (Exim 4.92) (envelope-from ) id 1t3uhs-0005lV-PL; Thu, 24 Oct 2024 10:04:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 825099.1239303; Thu, 24 Oct 2024 10:04: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 1t3uhs-0005kj-I2; Thu, 24 Oct 2024 10:04:40 +0000 Received: by outflank-mailman (input) for mailman id 825099; Thu, 24 Oct 2024 10:04:39 +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 1t3uhr-0005hp-0O for xen-devel@lists.xenproject.org; Thu, 24 Oct 2024 10:04:39 +0000 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [2a00:1450:4864:20::530]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 604ba3ba-91ef-11ef-99a3-01e77a169b0f; Thu, 24 Oct 2024 12:04:37 +0200 (CEST) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5c9693dc739so886931a12.3 for ; Thu, 24 Oct 2024 03:04:37 -0700 (PDT) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66c72866sm5482506a12.95.2024.10.24.03.04.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 03:04:35 -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: 604ba3ba-91ef-11ef-99a3-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1729764276; x=1730369076; 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=cByNa6/hk0GoMLekCJ3KNnYw1LRCV4BYv94ebYfTHDY=; b=ibczguIw69WCyAJSY+G1QOiFFQ3ly8++IN72YDPCSW8yfc230QwIS2ax9fhrU3ElBq Id6t9tHVZtm3cw47k/qAjB5eLY7wxHMMKJfnL5lgl03G3MsiaG7sR0sA8LtFpCDpxoeL JauiBbJcQQWu2iUTEgx2WEAvSteoZftACaonU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729764276; x=1730369076; 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=cByNa6/hk0GoMLekCJ3KNnYw1LRCV4BYv94ebYfTHDY=; b=FstbKCx6yjivL/xqaqRo4BzqRoQyuZeO0prR0kjyi0pwukzuxsv7tiJ4waLC6enlMs 3JyL6pq6BL71cHUarU34U0ruL/4Wkw6/xIlhhGJx/SDLol9a77Nf9x6eyek9OAgAz7pE vcCbUDyaYNGPdo7K2ENep5k4eMGNaAsMBi+Gb7L9ojwC4YWi7AynaSrgi335z8+jIkUl vqMYxL7UPEjsMcBkQEBnbiZbchj0zEvAHfa7p+TJBHmCbgL26MnBFVGTFxFbWsL3iCUg BUKLCAfRl4EVTdvHorcE0qRR/QGFV5geeI8RYsfChMF5SXcj9uSvcqAgX5LZimg8aILy INqQ== X-Gm-Message-State: AOJu0YzxXFUmiGv4Ufq77DxBLkH9BjuwmaKAgkWFvb+Sq1IK1/8ORMfC dmnapTCN6yc5Ib0VAEA0oQ8lGd8Y9m5AbsIgjqSd8q2NPwDOAL7xqP6E30kGGqKzocY41OKLi1S 408E= X-Google-Smtp-Source: AGHT+IFQc//FcRKMsdqTdoMjpQ/Mmo7CnGs5JPPRiH32Z17oE4kXL6W/C3ADvghplQLCCgUMn+hxvw== X-Received: by 2002:a05:6402:40d2:b0:5cb:68cf:c730 with SMTP id 4fb4d7f45d1cf-5cb8af7dde3mr4781805a12.5.1729764276275; Thu, 24 Oct 2024 03:04:36 -0700 (PDT) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH v1 1/6] CI: Refresh the Debian 12 x86_64 container Date: Thu, 24 Oct 2024 11:04:16 +0100 Message-ID: <288fcc10dbcbdab1c33ebfb95bedf2366ba64122.1729760501.git.javi.merino@cloud.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Rework the container to use heredocs for readability, and use apt-get --no-install-recommends to keep the size down. This reduces the size of the (uncompressed) container from 3.44GB to 1.67GB. Signed-off-by: Javi Merino --- automation/build/debian/12-x86_64.dockerfile | 68 ++++++++++++++++++++ automation/build/debian/bookworm.dockerfile | 57 ---------------- automation/gitlab-ci/build.yaml | 20 +++--- automation/gitlab-ci/test.yaml | 14 ++-- automation/scripts/containerize | 2 +- 5 files changed, 86 insertions(+), 75 deletions(-) create mode 100644 automation/build/debian/12-x86_64.dockerfile delete mode 100644 automation/build/debian/bookworm.dockerfile diff --git a/automation/build/debian/12-x86_64.dockerfile b/automation/build/debian/12-x86_64.dockerfile new file mode 100644 index 000000000000..e0ca8b7e9c91 --- /dev/null +++ b/automation/build/debian/12-x86_64.dockerfile @@ -0,0 +1,68 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive + +# build depends +RUN <&1 | tee ${LOGFILE} needs: - - debian-bookworm-gcc-debug + - debian-12-x86_64-gcc-debug qemu-smoke-x86-64-clang: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE} needs: - - debian-bookworm-clang-debug + - debian-12-x86_64-clang-debug qemu-smoke-x86-64-gcc-pvh: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE} needs: - - debian-bookworm-gcc-debug + - debian-12-x86_64-gcc-debug qemu-smoke-x86-64-clang-pvh: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE} needs: - - debian-bookworm-clang-debug + - debian-12-x86_64-clang-debug qemu-smoke-x86-64-gcc-efi: extends: .qemu-smoke-x86-64 script: - ./automation/scripts/qemu-smoke-x86-64-efi.sh pv 2>&1 | tee ${LOGFILE} needs: - - debian-bookworm-gcc-debug + - debian-12-x86_64-gcc-debug qemu-smoke-riscv64-gcc: extends: .qemu-riscv64 diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 6ac02c42d124..ea6e1a9b18f4 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -34,7 +34,7 @@ case "_${CONTAINER}" in _bullseye-riscv64) CONTAINER="${BASE}/debian:11-riscv64" ;; _bookworm-riscv64) CONTAINER="${BASE}/debian:12-riscv64" ;; _bookworm-x86_64-gcc-ibt) CONTAINER="${BASE}/debian:12-x86_64-gcc-ibt" ;; - _bookworm|_) CONTAINER="${BASE}/debian:bookworm" ;; + _bookworm|_bookworm-x86_64|_) CONTAINER="${BASE}/debian:12-x86_64" ;; _bookworm-i386) CONTAINER="${BASE}/debian:bookworm-i386" ;; _bookworm-arm64v8-arm32-gcc) CONTAINER="${BASE}/debian:bookworm-arm64v8-arm32-gcc" ;; _bookworm-arm64v8) CONTAINER="${BASE}/debian:bookworm-arm64v8" ;; From patchwork Thu Oct 24 10:04:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javi Merino X-Patchwork-Id: 13848691 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 D4055CFA451 for ; Thu, 24 Oct 2024 10:04:53 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.825102.1239322 (Exim 4.92) (envelope-from ) id 1t3uht-00066T-QO; Thu, 24 Oct 2024 10:04:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 825102.1239322; Thu, 24 Oct 2024 10:04:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t3uht-00064G-Ed; Thu, 24 Oct 2024 10:04:41 +0000 Received: by outflank-mailman (input) for mailman id 825102; Thu, 24 Oct 2024 10:04:40 +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 1t3uhs-0005hp-0X for xen-devel@lists.xenproject.org; Thu, 24 Oct 2024 10:04:40 +0000 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [2a00:1450:4864:20::130]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 609a36d6-91ef-11ef-99a3-01e77a169b0f; Thu, 24 Oct 2024 12:04:37 +0200 (CEST) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-539e690479cso754391e87.3 for ; Thu, 24 Oct 2024 03:04:37 -0700 (PDT) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66c72866sm5482506a12.95.2024.10.24.03.04.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 03:04:36 -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: 609a36d6-91ef-11ef-99a3-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1729764277; x=1730369077; 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=LQWmvDlLDweK6ujseIAxFWUbMQufNhICWPD0ghEGPJ8=; b=Tg+eaA9o6JthTTtnFFmyxTKIDNtk4tdOVpM6vncyP41BCqTdJNx0FD0vafZDlHf6/q PMilH1m666sckCvwmy8F9Xh8NWE2Hdx7kivVbmK4kor35ArdbVNFKc5twliNubLcYPIf dFHEocGoLtY//fX7h0zFpGc97q5gmvqyZZIPo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729764277; x=1730369077; 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=LQWmvDlLDweK6ujseIAxFWUbMQufNhICWPD0ghEGPJ8=; b=qHTc82W4qSXbYLBagCtQXJ+BXSGBUbMqGeBpBZGAXVNsB86rKhTz8ncUfsn8ZyFIoG nJZBnQhG3UOyEj53pt9YqIpa7s2wArQVkY7GK56vUlHxBWqMEEcOTKNQCf63Vo2603nC YLajIMoLhT2flSh024u796f/K5BYQ6NPdr/xMT/Y5z/R60QZkxNBAyMZYLWXAjfBiHyk ikRT54PHKZJIwTFqSBhD5MYJV7KqMk5qvPDTp9dV2m6EYULp3IUxoIwCwQcU5y7eaYdp 2zhhz2HFRyFOj3+vjqI4ivZxfz9PBKMiwRe2DKE3kl8VPR0+gkjpCsGMr+dxyV8P7xb+ lJcA== X-Gm-Message-State: AOJu0Yzi4p4DP5zGBGROkyy59caVTvltxLdclp/W63Fju2X/RoZGh+ks DSXwi/ZvKDaJ4GAk/ImZ0wwm7/0fSU0Rque0IdO91lcJUzGK1F46OnRfvycwiuOMahlBS0ltiaH 7T1E= X-Google-Smtp-Source: AGHT+IHivd6x7FEdY3knn+Ey/pTnjQIOBE6BovxR+ERumwEH7ARZ/OZwbEEuuJNPlrNoyrODUcZZcA== X-Received: by 2002:a05:6512:400d:b0:539:964c:16d4 with SMTP id 2adb3069b0e04-53b1a347b64mr3085470e87.36.1729764276837; Thu, 24 Oct 2024 03:04:36 -0700 (PDT) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH v1 2/6] CI: Refresh the Debian 12 x86_32 container Date: Thu, 24 Oct 2024 11:04:17 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Rework the container to be non-root, use heredocs for readability, and use apt-get --no-install-recommends to keep the size down. Rename the job to x86_32, to be consistent with XEN_TARGET_ARCH and the naming scheme of all the other CI jobs: ${VERSION}-${ARCH}-${BUILD_NAME} Remove build dependencies for building QEMU, as we don't do it since e305256e69b1 ("CI: Stop building QEMU in general"). Remove build dependencies for the documentation as we don't have to build it for every single arch. This reduces the size of the container from 2.22GB to 1.32Gb. Signed-off-by: Javi Merino --- automation/build/debian/12-x86_32.dockerfile | 51 +++++++++++++++++++ .../build/debian/bookworm-i386.dockerfile | 50 ------------------ automation/gitlab-ci/build.yaml | 8 +-- automation/scripts/containerize | 2 +- 4 files changed, 56 insertions(+), 55 deletions(-) create mode 100644 automation/build/debian/12-x86_32.dockerfile delete mode 100644 automation/build/debian/bookworm-i386.dockerfile diff --git a/automation/build/debian/12-x86_32.dockerfile b/automation/build/debian/12-x86_32.dockerfile new file mode 100644 index 000000000000..d3c67a256212 --- /dev/null +++ b/automation/build/debian/12-x86_32.dockerfile @@ -0,0 +1,51 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/i386 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV USER root + +# build depends +RUN < X-Patchwork-Id: 13848690 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 20F7DCFA456 for ; Thu, 24 Oct 2024 10:04:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.825100.1239308 (Exim 4.92) (envelope-from ) id 1t3uht-0005q2-0r; Thu, 24 Oct 2024 10:04:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 825100.1239308; Thu, 24 Oct 2024 10:04: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 1t3uhs-0005nS-Qr; Thu, 24 Oct 2024 10:04:40 +0000 Received: by outflank-mailman (input) for mailman id 825100; Thu, 24 Oct 2024 10:04: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 1t3uhr-0005hv-2V for xen-devel@lists.xenproject.org; Thu, 24 Oct 2024 10:04:39 +0000 Received: from mail-lf1-x130.google.com (mail-lf1-x130.google.com [2a00:1450:4864:20::130]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 60db4d1f-91ef-11ef-a0bf-8be0dac302b0; Thu, 24 Oct 2024 12:04:38 +0200 (CEST) Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-53a007743e7so850546e87.1 for ; Thu, 24 Oct 2024 03:04:38 -0700 (PDT) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66c72866sm5482506a12.95.2024.10.24.03.04.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 03:04:37 -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: 60db4d1f-91ef-11ef-a0bf-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1729764277; x=1730369077; 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=MpCJXGcVny4qY37VLhg54wKOfSqt3MWgG1985f7jSN8=; b=PkLWyoz+k38ypMH0sm8zNCIbVrB1kxCg1/4MQIrPFJPHeAVGnBdEkKk5MO6J8WbjCq iymmPPOoCAC1hFizLEkQESNulnLpV7K4kMTPe5GG1YvkWxxuT73rpPR6trYLzeUVW9D6 wrxH5gGYCVfy7HngK+TvIXAfgcnEAGq7CsmoA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729764277; x=1730369077; 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=MpCJXGcVny4qY37VLhg54wKOfSqt3MWgG1985f7jSN8=; b=qW2HPSo9CztD0BHf5iTWSuMb80819LZL40uTiI8huJLUmsAKCQe1qmGganWsDJEbFT 5/nXULbmG4Ngw/Y4KvCNnsFwKgD3uSRUnHC71TiO3WUvXGPCNyWmXHQFGQRyCDEj41SB HwEMbeh16j9JaR8bQTynfKUcLpHxqFOroT0Fx96qdL2vovdt98Io8bouscWoik+iFJZW ydOew3HvpeeDxWe+eZF33hdi7jtcS1Q6eG+/XBoO1TOB0l7I2zCTo+/0pKjB0F5HbLnr UutpmMLYlZ8wCXlW63jApiGt2ZPYoCRu1f+46Ldvvd7Br6GaX90Qw9fZ3ZnCQ0JdZSei hYlw== X-Gm-Message-State: AOJu0Yy+pC6b6dbDiXLs+bdxNZEvI5FFZoCp6slev4Vmbf5rQeJPfc2W pl24r1vrEUqYQ0ggBVhyXyKY47oInrdXZ/JMVD8QrRW9aeQK/R3UEe2rBT+Ym+I2lYyqP1HnjpI fzUg= X-Google-Smtp-Source: AGHT+IGnKFsjEXeSsDFmCi7N84r6N86DDLlEJWdL3RWtQ8Mkd+KE+dji58Ba50xXb7lDdIyZR1gahw== X-Received: by 2002:a05:6512:1246:b0:536:9f72:c427 with SMTP id 2adb3069b0e04-53b1a343cfamr2894874e87.28.1729764277339; Thu, 24 Oct 2024 03:04:37 -0700 (PDT) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH v1 3/6] CI: Refresh the Debian 12 arm64 container Date: Thu, 24 Oct 2024 11:04:18 +0100 Message-ID: <50c1ec986787c8fe3bf975b0003069b67e885032.1729760501.git.javi.merino@cloud.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Rework the container to use heredocs for readability and use apt-get --no-install-recommends to keep the size down. Rename the job to debian-12-arm64-* to follow the naming scheme of all the other CI jobs. This reduces the size of the debian:12-arm64v8 from 2.25GB down to 1.62GB. Signed-off-by: Javi Merino --- automation/build/debian/12-arm64v8.dockerfile | 68 +++++++++++++++++++ .../build/debian/bookworm-arm64v8.dockerfile | 55 --------------- automation/gitlab-ci/build.yaml | 8 +-- automation/gitlab-ci/test.yaml | 4 +- automation/scripts/containerize | 2 +- 5 files changed, 75 insertions(+), 62 deletions(-) create mode 100644 automation/build/debian/12-arm64v8.dockerfile delete mode 100644 automation/build/debian/bookworm-arm64v8.dockerfile diff --git a/automation/build/debian/12-arm64v8.dockerfile b/automation/build/debian/12-arm64v8.dockerfile new file mode 100644 index 000000000000..4da1b074aedb --- /dev/null +++ b/automation/build/debian/12-arm64v8.dockerfile @@ -0,0 +1,68 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive + +# build depends +RUN < X-Patchwork-Id: 13848696 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 A2F3BCFA47E for ; Thu, 24 Oct 2024 10:04:58 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.825101.1239313 (Exim 4.92) (envelope-from ) id 1t3uht-0005zM-8x; Thu, 24 Oct 2024 10:04:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 825101.1239313; Thu, 24 Oct 2024 10:04:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t3uht-0005xE-4Y; Thu, 24 Oct 2024 10:04:41 +0000 Received: by outflank-mailman (input) for mailman id 825101; Thu, 24 Oct 2024 10:04: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 1t3uhr-0005hv-OL for xen-devel@lists.xenproject.org; Thu, 24 Oct 2024 10:04:39 +0000 Received: from mail-ed1-x52e.google.com (mail-ed1-x52e.google.com [2a00:1450:4864:20::52e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 61683d3f-91ef-11ef-a0bf-8be0dac302b0; Thu, 24 Oct 2024 12:04:39 +0200 (CEST) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-5c96b2a10e1so993732a12.2 for ; Thu, 24 Oct 2024 03:04:39 -0700 (PDT) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66c72866sm5482506a12.95.2024.10.24.03.04.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 03:04:37 -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: 61683d3f-91ef-11ef-a0bf-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1729764278; x=1730369078; 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=QzmWp98zY9Vb786BtlEJUzc3WOUq+fnBSycqJrqunEI=; b=Ac4uP4/bxh+PiYgiOzZa8gcANWMDqvKJE5Q1c7ydavSC6R8Kg2rqE9Z1p0xl3ZSduu 0rxkiX0XKGDdGf51oakkgVu/hv7/XuT45HJXY7k+kP0EEqd72nzKPBUKBFzuTpvKSnPy fjK0YHAqIPXY/qqqvC+C0aA2lkYXwmStldsbw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729764278; x=1730369078; 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=QzmWp98zY9Vb786BtlEJUzc3WOUq+fnBSycqJrqunEI=; b=BgxCeKLhyZbN0u6Iq2pN7R0imQN9kdHRqR5T0nVzby6hflPRklEz51W7aYeRDYRv0q tiiWE2cCft3km/OjBbh7mCoXZW5rzM5J1cPm6AWrN5d13Vp+TAl784leV+gngFI3z5o8 lKFiu0CSD38n0goEdQCioPkKYNscBUSXqNE7GzuKKeDDlXoZ9CAlwxZn8tInT4MZzYM/ VLNV2KEVkmjGpHot/tk888C4Bj6OPxdqh5gn2bYe6ebQeogs3sBIvAvPtyAjknFWjRiZ 0iCu4QH2JKl0z4jF4DmDiKhaFg/crjvdJml4uAPnmDgxZNko4Rfy+V8A+BaVYxqmYvdP upGQ== X-Gm-Message-State: AOJu0YyNT4bNe3bthJRp5mr1cGbecIkCPMe6ZmLj6UdoE9KjcaXpcccU 3OtZUFJjKtjzPphgNYaNHbCso+TT7WVt6Icy4bY+0r01C/0OHmKxhwpMoEiqBZKc2VD1luoHC01 Iy2w= X-Google-Smtp-Source: AGHT+IHgyBo2myOsidtWER+08bvZ/I7fAnSKP3nFVhSk75cnlOePjSojeVmJFomuIK/kaA7p7rWTzw== X-Received: by 2002:a05:6402:1cc1:b0:5c9:5bcf:db95 with SMTP id 4fb4d7f45d1cf-5cba246719cmr1093552a12.16.1729764278201; Thu, 24 Oct 2024 03:04:38 -0700 (PDT) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH v1 4/6] CI: Refresh the Debian 12 arm32 cross compile container Date: Thu, 24 Oct 2024 11:04:19 +0100 Message-ID: <762312efd58aa1b41cfcb5439f2fd35580b8bba6.1729760501.git.javi.merino@cloud.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Rework the container to run as non-root, use heredocs for readability and use apt-get --no-install-recommends to keep the size down. Rename the CI jobs to debian-12-arm32- to follow the naming scheme of all the other CI jobs. Signed-off-by: Javi Merino --- .../debian/12-arm64v8-arm32-gcc.dockerfile | 28 +++++++++++++++++++ .../bookworm-arm64v8-arm32-gcc.dockerfile | 24 ---------------- automation/gitlab-ci/build.yaml | 20 ++++++------- automation/gitlab-ci/test.yaml | 14 +++++----- automation/scripts/containerize | 2 +- 5 files changed, 46 insertions(+), 42 deletions(-) create mode 100644 automation/build/debian/12-arm64v8-arm32-gcc.dockerfile delete mode 100644 automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile diff --git a/automation/build/debian/12-arm64v8-arm32-gcc.dockerfile b/automation/build/debian/12-arm64v8-arm32-gcc.dockerfile new file mode 100644 index 000000000000..bdc935706bfa --- /dev/null +++ b/automation/build/debian/12-arm64v8-arm32-gcc.dockerfile @@ -0,0 +1,28 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 debian:bookworm +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive +ENV CROSS_COMPILE /usr/bin/arm-linux-gnueabihf- + +RUN <&1 | tee ${LOGFILE} needs: - *arm32-test-needs - - debian-bookworm-gcc-arm32 + - debian-12-arm32-gcc qemu-smoke-dom0less-arm32-gcc-debug: extends: .qemu-arm32 @@ -406,7 +406,7 @@ qemu-smoke-dom0less-arm32-gcc-debug: - ./automation/scripts/qemu-smoke-dom0less-arm32.sh 2>&1 | tee ${LOGFILE} needs: - *arm32-test-needs - - debian-bookworm-gcc-arm32-debug + - debian-12-arm32-gcc-debug qemu-smoke-dom0less-arm32-gcc-debug-staticmem: extends: .qemu-arm32 @@ -414,7 +414,7 @@ qemu-smoke-dom0less-arm32-gcc-debug-staticmem: - ./automation/scripts/qemu-smoke-dom0less-arm32.sh static-mem 2>&1 | tee ${LOGFILE} needs: - *arm32-test-needs - - debian-bookworm-gcc-arm32-debug-staticmem + - debian-12-arm32-gcc-debug-staticmem qemu-smoke-dom0less-arm32-gcc-debug-gzip: extends: .qemu-arm32 @@ -422,7 +422,7 @@ qemu-smoke-dom0less-arm32-gcc-debug-gzip: - ./automation/scripts/qemu-smoke-dom0less-arm32.sh gzip 2>&1 | tee ${LOGFILE} needs: - *arm32-test-needs - - debian-bookworm-gcc-arm32-debug + - debian-12-arm32-gcc-debug qemu-smoke-dom0less-arm32-gcc-without-dom0: extends: .qemu-arm32 @@ -430,7 +430,7 @@ qemu-smoke-dom0less-arm32-gcc-without-dom0: - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE} needs: - *arm32-test-needs - - debian-bookworm-gcc-arm32 + - debian-12-arm32-gcc qemu-smoke-dom0less-arm32-gcc-debug-without-dom0: extends: .qemu-arm32 @@ -438,7 +438,7 @@ qemu-smoke-dom0less-arm32-gcc-debug-without-dom0: - ./automation/scripts/qemu-smoke-dom0less-arm32.sh without-dom0 2>&1 | tee ${LOGFILE} needs: - *arm32-test-needs - - debian-bookworm-gcc-arm32-debug + - debian-12-arm32-gcc-debug qemu-smoke-dom0less-arm32-gcc-debug-earlyprintk: extends: .qemu-arm32 @@ -446,7 +446,7 @@ qemu-smoke-dom0less-arm32-gcc-debug-earlyprintk: - ./automation/scripts/qemu-smoke-dom0less-arm32.sh earlyprintk 2>&1 | tee ${LOGFILE} needs: - *arm32-test-needs - - debian-bookworm-gcc-arm32-debug-earlyprintk + - debian-12-arm32-gcc-debug-earlyprintk qemu-alpine-x86_64-gcc: extends: .qemu-x86-64 diff --git a/automation/scripts/containerize b/automation/scripts/containerize index 1b75c8d93724..c9988bfe927d 100755 --- a/automation/scripts/containerize +++ b/automation/scripts/containerize @@ -36,7 +36,7 @@ case "_${CONTAINER}" in _bookworm-x86_64-gcc-ibt) CONTAINER="${BASE}/debian:12-x86_64-gcc-ibt" ;; _bookworm|_bookworm-x86_64|_) CONTAINER="${BASE}/debian:12-x86_64" ;; _bookworm-i386|_bookworm-x86_32) CONTAINER="${BASE}/debian:12-x86_32" ;; - _bookworm-arm64v8-arm32-gcc) CONTAINER="${BASE}/debian:bookworm-arm64v8-arm32-gcc" ;; + _bookworm-arm64v8-arm32-gcc) CONTAINER="${BASE}/debian:12-arm64v8-arm32-gcc" ;; _bookworm-arm64v8) CONTAINER="${BASE}/debian:12-arm64v8" ;; _bookworm-cppcheck) CONTAINER="${BASE}/debian:bookworm-cppcheck" ;; _opensuse-leap|_leap) CONTAINER="${BASE}/opensuse:leap-15.6-x86_64" ;; From patchwork Thu Oct 24 10:04:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javi Merino X-Patchwork-Id: 13848692 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 1B411CFA457 for ; Thu, 24 Oct 2024 10:04:55 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.825103.1239346 (Exim 4.92) (envelope-from ) id 1t3uhw-0006wB-9H; Thu, 24 Oct 2024 10:04:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 825103.1239346; Thu, 24 Oct 2024 10:04:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t3uhw-0006vv-5Z; Thu, 24 Oct 2024 10:04:44 +0000 Received: by outflank-mailman (input) for mailman id 825103; Thu, 24 Oct 2024 10:04:41 +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 1t3uht-0005hp-BS for xen-devel@lists.xenproject.org; Thu, 24 Oct 2024 10:04:41 +0000 Received: from mail-lf1-x136.google.com (mail-lf1-x136.google.com [2a00:1450:4864:20::136]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 61c814fe-91ef-11ef-99a3-01e77a169b0f; Thu, 24 Oct 2024 12:04:39 +0200 (CEST) Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-539ee1acb86so800338e87.0 for ; Thu, 24 Oct 2024 03:04:39 -0700 (PDT) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66c72866sm5482506a12.95.2024.10.24.03.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 03:04:38 -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: 61c814fe-91ef-11ef-99a3-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1729764279; x=1730369079; 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=pcIExxCBgl8rLcW0jJPs5XFDwtrNHzge9tk1pTltCDM=; b=ZTIL3peis0GHN2Yz6R0KDc5EhRSbV91sMTQiNDTcQXjkKo+lJMvlYcDrX/bwPj+/RA tn938GBMkFOoS1j5eO+5Sr3uSS5b+nH2cB11fpMGZWtHVfjQaRmASe3xaGnUuegiR8C/ wWA72KoGmxvqLuTNXNcFOfqWOSVzQpLqpHZnk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729764279; x=1730369079; 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=pcIExxCBgl8rLcW0jJPs5XFDwtrNHzge9tk1pTltCDM=; b=QqCk46VZEIb6mUcDbePOtFd2rBw9Xl47rEqRARyyVVpjEq/dPyOuGYNe9rxd5eryaU uFaXyHK/oXMOZeQcqp02mlv5SfIoa6ENMc/NOQnnKQJYGpw8/6XLbYYEe2DHf/Zcg9W5 ehKOhyc2ej/zYK+wNHd0YEKhNR1FJf+VyoCFhxYRCuo90/orq0TYnI4u3lpcUTYB5KFf S5GC0hZIDncee25TGMCsBazZcAJzpmj2Mmr6aXkGgBpDPqfGsSbAwTi+nvjXtBp9glO1 z8e4ycOPwslrX7VXD1Ne2pN1+tZAItnuVb3cAFlZG+WWOg48cVrhVYIrvOEjwWI9GZA8 CEkA== X-Gm-Message-State: AOJu0YyygXLr9JNt8vi0lLY9jVX5hzVzqMRJ4gqOmZ0yKYjmm5vjOERH eNt9TIOTTWy+HzuiVWhFAjxyg2M8FY+OOI3LZYBnBazD8YowVprQfulEmNhSlC0B5wJtJGZAwr+ +uWU= X-Google-Smtp-Source: AGHT+IHQijJSkYV+57Obt0d79pCzGC1jykeNC/JeuQYqLbS7uBPgBSPhvEinZde7rrhzZq+N3C0KQA== X-Received: by 2002:a05:6512:104a:b0:530:aa09:b6bf with SMTP id 2adb3069b0e04-53b1a303108mr3646425e87.24.1729764278793; Thu, 24 Oct 2024 03:04:38 -0700 (PDT) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini , Michal Orzel Subject: [XEN PATCH v1 5/6] CI: Refresh the Debian 12 cppcheck container Date: Thu, 24 Oct 2024 11:04:20 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Rework the container to build and run cppcheck as a normal user. Use heredocs for readability and use apt-get --no-install-recommends to keep the size down. Changed the libpcre3-dev dependency to libpcre3, as the -dev package is only needed for building, not for running. With the cleanups, the size of the container is reduced from 882MB to 782MB. Signed-off-by: Javi Merino Reviewed-by: Stefano Stabellini --- I tried updating cppcheck to the latest upstream version (2.15.0) but it reports misra errors like: xen/common/sched/cpupool.c(0,0):internalError:error:Bailing out from analysis: Checking file failed: Failed to execute addon 'misra' - exitcode is 1 [...] xen/arch/arm/decode.c(220,10):misra-config:error:Because of missing configuration, misra checking is incomplete. There can be false negatives! Variable 'type' is unknown The output log xen-cppcheck.txt from job #8164274901 which uses cppcheck 2.15.0 can be found at: https://gitlab.com/xen-project/people/javimerino/xen/-/jobs/8164274901/artifacts/browse Therefore, I'm keeping cppcheck at 2.7, which aligns with what docs/misra/cppcheck.txt says is the last tested version. .../debian/12-arm64v8-cppcheck.dockerfile | 80 +++++++++++++++++++ .../build/debian/bookworm-cppcheck.dockerfile | 54 ------------- automation/gitlab-ci/build.yaml | 12 +-- automation/scripts/containerize | 2 +- 4 files changed, 87 insertions(+), 61 deletions(-) create mode 100644 automation/build/debian/12-arm64v8-cppcheck.dockerfile delete mode 100644 automation/build/debian/bookworm-cppcheck.dockerfile diff --git a/automation/build/debian/12-arm64v8-cppcheck.dockerfile b/automation/build/debian/12-arm64v8-cppcheck.dockerfile new file mode 100644 index 000000000000..a839d4c57bda --- /dev/null +++ b/automation/build/debian/12-arm64v8-cppcheck.dockerfile @@ -0,0 +1,80 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/arm64/v8 debian:bookworm AS builder + +ENV DEBIAN_FRONTEND=noninteractive +ENV CPPCHECK_VERSION=2.7 + +# dependencies for cppcheck build +RUN < X-Patchwork-Id: 13848695 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 ABE6CCFA456 for ; Thu, 24 Oct 2024 10:04:55 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.825104.1239349 (Exim 4.92) (envelope-from ) id 1t3uhw-00070N-LO; Thu, 24 Oct 2024 10:04:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 825104.1239349; Thu, 24 Oct 2024 10:04:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t3uhw-0006zs-Hb; Thu, 24 Oct 2024 10:04:44 +0000 Received: by outflank-mailman (input) for mailman id 825104; Thu, 24 Oct 2024 10:04:42 +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 1t3uhu-0005hp-0w for xen-devel@lists.xenproject.org; Thu, 24 Oct 2024 10:04:42 +0000 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [2a00:1450:4864:20::533]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 620d4fbc-91ef-11ef-99a3-01e77a169b0f; Thu, 24 Oct 2024 12:04:40 +0200 (CEST) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5c96df52c52so839244a12.1 for ; Thu, 24 Oct 2024 03:04:40 -0700 (PDT) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cb66c72866sm5482506a12.95.2024.10.24.03.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Oct 2024 03:04:39 -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: 620d4fbc-91ef-11ef-99a3-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1729764279; x=1730369079; 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=sVlXuuK1xEQOAVzZHIn4SmM6Td3cV8czZgbgjjn4N1k=; b=Q8nrdOzGkK55Zmt2DPH5sQg8CdUGmhdInXPJyzy1C1oMbIqcZWnMLllmYCS/58tl3q XssAsKAqcHjJQVgorXXl/6NRQi1dVJnQjl2GOUU5sFv7J38pcsAlVmD24CSpJKnAunoH Xs3FHZQBj1+ZxXWxhWuCJmV69HYiaD+gFt8NM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729764279; x=1730369079; 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=sVlXuuK1xEQOAVzZHIn4SmM6Td3cV8czZgbgjjn4N1k=; b=gwLdybB/2NbnMaHoCV1YsbL2ZtRpu//Y7x30WOzjISaZBcwJ4dtHHSufyRUHE0mK4c ikw4ELglDhYSSKkBqjnlOXCFaAZpf0tlpT7lnnCQoQ9c4VQsY4RmISpSrxsGq7Pw3DYX e4UTrcA+kEbPAIyeZ+atGv/95rCKirIvM0viFbMhdG3qleRsst7+eRCUQ5t16hg5ta83 JdT6ptxjFAY9bNde4gQ8RdjbzDCSGtfiwLAVaRBb+dasFN8qXQTNpqQape6QVJg8cGI2 n/XFFLJcDxGryDquO+7/VWj9YwQs7id+UHgCQ+3p6hCn/fjz7GZRE9uf+09LvBzch7XR SDug== X-Gm-Message-State: AOJu0Yyvpkl+beRaAlzKUbsklazZdxOsAO1kq7DtjPEn3682Sg7amTAj 1eRpBIa8G5S3vWVkCdPT9mnr9Ti3GYm8bQxSwnYH9R9mbGPok851JGcWU3yEyxNISdsY55tdowg hETc= X-Google-Smtp-Source: AGHT+IFRyLmoJZ+UKlceAWsFPEGXV05Q3R+N3UCSgoAj/TGPHmJLMNKyBsWpxxsHg+yLoujSrU3D1A== X-Received: by 2002:a05:6402:280e:b0:5cb:7318:800d with SMTP id 4fb4d7f45d1cf-5cb8b26d8f1mr4678502a12.32.1729764279375; Thu, 24 Oct 2024 03:04:39 -0700 (PDT) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH v1 6/6] CI: Run the builds and tests that use the Debian 12 containers as a normal user Date: Thu, 24 Oct 2024 11:04:21 +0100 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 Use FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR so that GitLab CI clones xen using the user in the image, instead of as root[0]. In qemu-smoke-dom0*.sh and qemu-alpine-x86_64.sh, use fakeroot to create the rootfs images that untar a tarball that create character devices. cpio replicates the block and character devices, as well as preserving the uid and gid it sees in the current directory. fakeroot lets tar think that it is creating block and character devices, and all files are owned by root, but it is all smokes and mirrors for cpio. [0] https://gitlab.com/gitlab-org/gitlab-runner/-/issues/1736 Signed-off-by: Javi Merino --- Regarding building the rootfs, I have chosen to use a fakeroot subshell for the entire process. automation/scripts/qubes-x86-64.sh takes a different approach, it just uses fakeroot for the tar/cpio commands. I prefer to do it this way but I am happy to be overridden if `fakeroot -s ../save tar` and `fakeroot -i ../save cpio` are preferred. automation/build/debian/12-arm64v8.dockerfile | 5 ++++- automation/build/debian/12-x86_64.dockerfile | 5 ++++- automation/gitlab-ci/test.yaml | 4 ++++ automation/scripts/qemu-alpine-x86_64.sh | 4 +++- automation/scripts/qemu-smoke-dom0-arm64.sh | 7 +++++-- automation/scripts/qemu-smoke-dom0less-arm64.sh | 5 +++-- 6 files changed, 23 insertions(+), 7 deletions(-) diff --git a/automation/build/debian/12-arm64v8.dockerfile b/automation/build/debian/12-arm64v8.dockerfile index 4da1b074aedb..c2617956ed77 100644 --- a/automation/build/debian/12-arm64v8.dockerfile +++ b/automation/build/debian/12-arm64v8.dockerfile @@ -10,6 +10,8 @@ RUN < ../initrd.cpio.gz cd .. # initrd.tar.gz is Dom0 rootfs +fakeroot <> etc/rc.conf # rebuild Dom0 rootfs find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz -cd ../.. +EOF +cd .. cat >> binaries/pxelinux.0 << EOF #!ipxe diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 4d22a124df11..8f9bfd620ee3 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -27,8 +27,10 @@ cd initrd find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz cd .. -mkdir -p rootfs +fakeroot <> etc/rc.conf find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz -cd ../.. +EOF +cd .. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded curl -fsSLO https://github.com/qemu/qemu/raw/v5.2.0/pc-bios/efi-virtio.rom diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 83e1866ca6c5..2d60f22d68b7 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -112,7 +112,8 @@ find . | cpio --create --format='newc' | gzip > ../binaries/initrd cd .. # DOM0 rootfs -mkdir -p rootfs +fakeroot <> etc/rc.conf find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz -cd .. +EOF # ImageBuilder echo 'MEMORY_START="0x40000000"