From patchwork Wed Nov 6 13:05:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javi Merino X-Patchwork-Id: 13864933 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 4B67ED44D5C for ; Wed, 6 Nov 2024 13:45:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.831083.1246238 (Exim 4.92) (envelope-from ) id 1t8gL7-0007B1-KQ; Wed, 06 Nov 2024 13:44:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 831083.1246238; Wed, 06 Nov 2024 13:44:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t8gL7-0007Au-Hq; Wed, 06 Nov 2024 13:44:53 +0000 Received: by outflank-mailman (input) for mailman id 831083; Wed, 06 Nov 2024 13:44:52 +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 1t8gL6-0007Ai-3o for xen-devel@lists.xenproject.org; Wed, 06 Nov 2024 13:44:52 +0000 Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [2a00:1450:4864:20::12f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 49a1ccad-9c45-11ef-a0c6-8be0dac302b0; Wed, 06 Nov 2024 14:44:47 +0100 (CET) Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-539f72c8fc1so7318769e87.1 for ; Wed, 06 Nov 2024 05:44:47 -0800 (PST) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cee6a9a3e3sm2708939a12.12.2024.11.06.05.05.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2024 05:05:23 -0800 (PST) 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: 49a1ccad-9c45-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjoxMmYiLCJoZWxvIjoibWFpbC1sZjEteDEyZi5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6IjQ5YTFjY2FkLTljNDUtMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMwOTAwNjg3LjY2MjE2OSwic2VuZGVyIjoiamF2aS5tZXJpbm9AY2xvdWQuY29tIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1730900687; x=1731505487; 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=ep8EzNnBGYuRzdmlGG1nNPu6Bpt+tpLeX3JycmIw8eY=; b=IebuaaWxaT09gmWVfAWELP350I1H4wDTtSRnZj4suEeqsAzMvepZ78cUwKiAv8Kqs2 9VYmCGf2fZUKk7X+NCOJDpj/KjmrAlO6+qXmZUqxGV25HFA0TpmeyjTeGwaa9BKQJ5hK 6tQN5oET35PyDM1OIBeU5Xo0CTeYmlGj1T/NI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730900687; x=1731505487; 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=ep8EzNnBGYuRzdmlGG1nNPu6Bpt+tpLeX3JycmIw8eY=; b=RvWO1naPWlFIB1q5hCqOoElKEwfv/apbml+hJoN4B/B4StyMzQphuGXGfd6LYsMugq gnMrpjSN8W3CTo7RiHwXrgDb4OQkWJyryZHOmhvr6UvhD6MVF6pIx9ywBF0weSut9Caf fGdyBhffsaYSOoWG5Nh+G5oq+nnvMztGrI5yx9esUrS33Wxt2ZBzTIbRTh4ScmW0y3/V zPMlUh5jUAyWjp3PfueQRNIbsAO7/lyKU3OKLKgBLg3zYeWNxRIEsTe/Xo2xxjOTplJI wG8A65Ix3x+CDW25K8z4cExKyXZkX5SdEzRokW6m1tve2u09vVFGXu2scudd1UdCg8wH b4OA== X-Gm-Message-State: AOJu0YzdjbWwJl5chp1vXtxTiXSiVhfE3QeOyrILKpnxe4Fr8B+QppRf JieAb7gDBfW9KXK7Jzhlo+HZ7dXmfLCsrJy4zX2CF7o0wXu6ezx4p2uh6REmyUiuniFMT/JC0Wk /9Vo= X-Google-Smtp-Source: AGHT+IElaVShQZYzT3KmsZKBxhonJq/DoVUXXNFDK3HSXpwRYLA5vkJRZy3oJuvg8M4YPRPQXSqITw== X-Received: by 2002:a05:6402:2748:b0:5ce:ddd4:7c2f with SMTP id 4fb4d7f45d1cf-5ceddd47c77mr6533443a12.7.1730898323243; Wed, 06 Nov 2024 05:05:23 -0800 (PST) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini , Andrew Cooper Subject: [XEN PATCH v2 1/6] CI: Refresh the Debian 12 x86_64 container Date: Wed, 6 Nov 2024 13:05:02 +0000 Message-ID: <083c6bb0194fdd082425185f9d153b355a47c614.1730743077.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.97GB. The container is left running the builds and tests as root to avoid breaking the xilinx runners. Signed-off-by: Javi Merino Reviewed-by: Andrew Cooper --- Changes in dependencies: $ diff -u <(git show origin/staging:automation/build/debian/bookworm.dockerfile | awk '/&&/{f=0};f;/apt-get \-\-quiet/{f=1};' | perl -ne 's/ \\$//;s/^ +//; /^#/ or print' | sort) <(awk '/^ +\)/{f=0};f;/DEPS=\(/{f=1}' automation/build/debian/12-x86_64.dockerfile | perl -ne 's/^\s+//; /^#/ or print' | sort) --- /proc/self/fd/16 2024-11-05 14:06:10.160095997 +0000 +++ /proc/self/fd/17 2024-11-05 14:06:10.160095997 +0000 @@ -1,34 +1,29 @@ acpica-tools -apt-transport-https bcc bin86 bison build-essential busybox-static +ca-certificates checkpolicy clang cpio expect flex -git -gnupg -golang -libaio-dev -libfindlib-ocaml-dev -libglib2.0-dev +git-core +golang-go +libbz2-dev liblzma-dev +liblzo2-dev libncurses5-dev libnl-3-dev -libpixman-1-dev libyajl-dev -markdown -nasm +libzstd-dev +ocaml-findlib ocaml-nox ovmf -pandoc pkg-config python3-dev python3-setuptools qemu-system-x86 -transfig uuid-dev automation/build/debian/12-x86_64.dockerfile | 71 ++++++++++++++++++++ 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, 89 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..c440748f2336 --- /dev/null +++ b/automation/build/debian/12-x86_64.dockerfile @@ -0,0 +1,71 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 debian:bookworm +LABEL maintainer.name="The Xen Project" +LABEL 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 Wed Nov 6 13:05:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javi Merino X-Patchwork-Id: 13864910 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 19931D44D59 for ; Wed, 6 Nov 2024 13:28:35 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.830968.1246113 (Exim 4.92) (envelope-from ) id 1t8g56-0005Aa-DY; Wed, 06 Nov 2024 13:28:20 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 830968.1246113; Wed, 06 Nov 2024 13:28:20 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t8g56-00059E-99; Wed, 06 Nov 2024 13:28:20 +0000 Received: by outflank-mailman (input) for mailman id 830968; Wed, 06 Nov 2024 13:28:19 +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 1t8g55-0004n0-8I for xen-devel@lists.xenproject.org; Wed, 06 Nov 2024 13:28:19 +0000 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [2a00:1450:4864:20::134]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 2411518e-9c42-11ef-a0c6-8be0dac302b0; Wed, 06 Nov 2024 14:28:05 +0100 (CET) Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-539fb49c64aso9394617e87.0 for ; Wed, 06 Nov 2024 05:27:25 -0800 (PST) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cee6a9a3e3sm2708939a12.12.2024.11.06.05.05.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2024 05:05:23 -0800 (PST) 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: 2411518e-9c42-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjoxMzQiLCJoZWxvIjoibWFpbC1sZjEteDEzNC5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6IjI0MTE1MThlLTljNDItMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMwODk5Njg2LjA2Mywic2VuZGVyIjoiamF2aS5tZXJpbm9AY2xvdWQuY29tIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1730899335; x=1731504135; 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=xApgKSTK5wMGuq0ugpp4Wf2jL7mq6KYsKPKyawXSsjg=; b=W2DonOCCjVI2fXhSAk98znyTWVQHWnuj+d7IKo8DoDIlP85QHa9fqOYVowKp8Leoft fqxOVp9mq/+44By+/NyfOslvKE1/4pa6aIU3LhuuyzLSM8SrkQgGZr19hHWWS4aKjAtw L8K1Ms4faEkstuqGGmYH7VS/KMAPxnk2pwPnE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730899335; x=1731504135; 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=xApgKSTK5wMGuq0ugpp4Wf2jL7mq6KYsKPKyawXSsjg=; b=R5GtYSBcIXRkO9ljx7HZEQwhnFP9N70ajiM0+NRRl9O/Mm1IZvwvkQhN4K2JVopMtR o21CSUKVJzEdfpiX7dKqr6GMu3etpCszHGtvozSy+FGAKun5aopuv7wPlT10Au1xAoJz GVO5/z3ilL6JAa46zKydNO/at3hJTBvIC9jXrkA9Rt5Xg7DahIOZaEOzYOquxJ1QPo3j 9xNHJDAgN4tK193DUZ575u41ZXO2YvEAykF/5G/LiDPgNIVyYfgZYQPK68uFoiAWzE1Z W2/5LxYFYAGrswGj56o4/au34uenotyTgUlDHDWEMI0hSlSqnN7Nm0qEbT8aLcJVNvLh F6ow== X-Gm-Message-State: AOJu0YypalNiirDkAGb2beygMBf2EV9L4/CUZ70OCiPqkOt14qOUc6o0 EmU+n2sKQRMPoB9w/XHQSAQUr9o3GlnB3FSu0av6BKHCl2G/9Xai4vs0Bj4ApLhgIan1DiA4Om0 M2Is= X-Google-Smtp-Source: AGHT+IGwqfbuEDxDxzQYcIO3SNDIjB5+YEi1B2xdbeRSCXdCh7ZM/aARZRROlbUc9hICKNlDxIN88A== X-Received: by 2002:a05:6402:2547:b0:5c8:8290:47bf with SMTP id 4fb4d7f45d1cf-5ceb92aad89mr20048288a12.21.1730898323761; Wed, 06 Nov 2024 05:05:23 -0800 (PST) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH v2 2/6] CI: Refresh the Debian 12 x86_32 container Date: Wed, 6 Nov 2024 13:05:03 +0000 Message-ID: <6ca245790b8bd2469e82dd54ff3cedd12096369c.1730743077.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 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 Reviewed-by: Andrew Cooper --- automation/build/debian/12-x86_32.dockerfile | 50 +++++++++++++++++++ .../build/debian/bookworm-i386.dockerfile | 50 ------------------- automation/gitlab-ci/build.yaml | 8 +-- automation/scripts/containerize | 2 +- 4 files changed, 55 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..b1cabf8d2f6d --- /dev/null +++ b/automation/build/debian/12-x86_32.dockerfile @@ -0,0 +1,50 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/i386 debian:bookworm +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive + +# build depends +RUN < X-Patchwork-Id: 13864911 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 CC728D44D59 for ; Wed, 6 Nov 2024 13:28:37 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.830962.1246098 (Exim 4.92) (envelope-from ) id 1t8g4t-0004nD-PE; Wed, 06 Nov 2024 13:28:07 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 830962.1246098; Wed, 06 Nov 2024 13:28:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t8g4t-0004n6-Mb; Wed, 06 Nov 2024 13:28:07 +0000 Received: by outflank-mailman (input) for mailman id 830962; Wed, 06 Nov 2024 13:28:06 +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 1t8g4s-0004n0-Ox for xen-devel@lists.xenproject.org; Wed, 06 Nov 2024 13:28:06 +0000 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [2a00:1450:4864:20::632]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 1521756b-9c42-11ef-a0c6-8be0dac302b0; Wed, 06 Nov 2024 14:26:52 +0100 (CET) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-a9a4031f69fso1062501566b.0 for ; Wed, 06 Nov 2024 05:24:25 -0800 (PST) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cee6a9a3e3sm2708939a12.12.2024.11.06.05.05.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2024 05:05:24 -0800 (PST) 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: 1521756b-9c42-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo2MzIiLCJoZWxvIjoibWFpbC1lajEteDYzMi5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6IjE1MjE3NTZiLTljNDItMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMwODk5NjE3LjYxODE3NCwic2VuZGVyIjoiamF2aS5tZXJpbm9AY2xvdWQuY29tIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1730899310; x=1731504110; 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=45oT54b/H6Gj3avxI/jIkIoWZCdO/tkO5E9TuzQK8WA=; b=baN70awTY8HtKCcUi2j937ez9nkWPnYU2E0WeVLQC2NBZDBGH6ClmQqsjCYDay9K/b uP1TeWvRIOy8qlb5CfSqftI5/QzndzS5xqu3v1BGQ5aqU/WtlQRv4ikKn8J7PDaIn3Cw jYmL5V0eCSe9Om4sVsGMXO6WaaKTPn37nzdP8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730899310; x=1731504110; 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=45oT54b/H6Gj3avxI/jIkIoWZCdO/tkO5E9TuzQK8WA=; b=nreV8ndLUu4tfgWfYPCnnHfy0t0Vx9aHJdM9wW7P+J4mBlj1pnRG0/26BgBWZ+GWWL cj/I6gZ3+F6gtXMnan0hoOoqeoEwNk8ppZnYazsBwM1C5ahlDC4SGNNyL0NDJ59nqQsM 0lVkffBkq+Xxqqk7ljZ87fBJe/8SQhcOOOP0R6ZCGQWyU90/JqSb9gWS9cZmn1XkdhhN vcB6VPWAGPzFYXWYYCo+tTuN1RDdpkX2f4VyZGtutUA2pQztwQqTfGNigQ/uoQwzIE0p JtSxmQvuTWzYmT4Sk35JPt7N2wxhYVAcG45APrS8OJ5tqlrt+FVLdWJERVWLqmVGwlFq FTjw== X-Gm-Message-State: AOJu0Yw94UnDrre/Ai0gfkzfKSe7WznjKQSUznJe5ycGEyKJFlO0Jocj R0sZuPxfpfIMbsli1eMc1d9VZE5HSq6kx9HHvtLs0R2m3P4aeCkYsw0RSUkUHMGlVXI2wh2T64l mmTk= X-Google-Smtp-Source: AGHT+IGaj5tsjSQdTpTziZ4I4VRkmICS/rKn3GSGax+Rv5p9Rgm1e9BDeOKl0uwbR2ReE9mJNcIl9A== X-Received: by 2002:a05:6402:5203:b0:5ca:14e5:b685 with SMTP id 4fb4d7f45d1cf-5cbbf888bcemr29942500a12.3.1730898324303; Wed, 06 Nov 2024 05:05:24 -0800 (PST) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH v2 3/6] CI: Refresh the Debian 12 arm64 container Date: Wed, 6 Nov 2024 13:05:04 +0000 Message-ID: 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. The container is left running the builds and tests as root to avoid breaking the xilinx runners. 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..fa53eb174862 --- /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" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV DEBIAN_FRONTEND=noninteractive + +# build depends +RUN < X-Patchwork-Id: 13864916 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 E3EB6D44D5E for ; Wed, 6 Nov 2024 13:37:21 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.831011.1246149 (Exim 4.92) (envelope-from ) id 1t8gDX-0000cw-Rq; Wed, 06 Nov 2024 13:37:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 831011.1246149; Wed, 06 Nov 2024 13:37:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t8gDX-0000cp-Oe; Wed, 06 Nov 2024 13:37:03 +0000 Received: by outflank-mailman (input) for mailman id 831011; Wed, 06 Nov 2024 13:37:02 +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 1t8gDV-0000bw-Ut for xen-devel@lists.xenproject.org; Wed, 06 Nov 2024 13:37:02 +0000 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [2a00:1450:4864:20::52f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 314d25a0-9c44-11ef-a0c6-8be0dac302b0; Wed, 06 Nov 2024 14:36:57 +0100 (CET) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5c957d8bce2so3557746a12.2 for ; Wed, 06 Nov 2024 05:36:57 -0800 (PST) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cee6a9a3e3sm2708939a12.12.2024.11.06.05.05.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2024 05:05:24 -0800 (PST) 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: 314d25a0-9c44-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo1MmYiLCJoZWxvIjoibWFpbC1lZDEteDUyZi5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6IjMxNGQyNWEwLTljNDQtMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMwOTAwMjE3LjIxNDM4OCwic2VuZGVyIjoiamF2aS5tZXJpbm9AY2xvdWQuY29tIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1730900216; x=1731505016; 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=xH5wKOdOvZjOHcy7mDqmxoiWP49Ll4vPM7f/D8pUsAo=; b=kxZFrGawbEmJISROR9uICQpUJo5kAVQwA0Y7ck3m1ruEgmqlTE+jmMpxTKzfPvva0w b5O6vHPI2PWycK8bObLiX1au7v9fhH12O8W6YL89qKivZbuzX+oezgg7jdZnb/9rZRy3 rSNUr2qnrvO+NcS9dvYvq0zdCEKJDowt+pa94= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730900216; x=1731505016; 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=xH5wKOdOvZjOHcy7mDqmxoiWP49Ll4vPM7f/D8pUsAo=; b=Zw1KeoAwvutOSbAO30ezBSKcw7D3LYufDXu+x4xS2toTL4F+2rZIwiNZDIejgyPide OJs2spBvLLofcpMzh7cdrdgk2fKbmCdLCTywM5hnlHoNXoq07pbh0pNK+lOdvmg6XyOR wL0GHL9xPQwlIbmZ9bB6TGD9FEOrMO3o4lfa1C9NSsDN4PIq6Qr9s7jQMQhE4+nLTxlk 89NHezcuLugEDDkyLZPc2Gb0+EFwtwCSo5rBEUQFNWl9JcTmHqEZYU7mTU1jh/kMGNgj BfOzqaP2Jwm278HFBp49CYKjnNBUCBtxa5Ofe+mR6/EijWEKEmvaFnimFoOxseOOV1Ic Z8XA== X-Gm-Message-State: AOJu0Yx4D/mgnyWPHkKhwVO594wfdd/RpHdqSe4K73D8AGEudMvFUNrZ dqytiBD8OyiHbaXFzPBkLQl/swRGCohTghtSLf5LxSlHJm9KuuPpr69uCGZETylhO7JZqurRST/ nH2c= X-Google-Smtp-Source: AGHT+IGlJSWig6UQewzo2rPWl/JG425oYkgK6QnRb6acnpheKGd4wy9ZgYUxeTukBaspLTcc/lFywA== X-Received: by 2002:a05:6402:280a:b0:5c9:45b5:6077 with SMTP id 4fb4d7f45d1cf-5ceb935bc94mr20003942a12.23.1730898325010; Wed, 06 Nov 2024 05:05:25 -0800 (PST) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini , Anthony PERARD Subject: [XEN PATCH v2 4/6] CI: Refresh the Debian 12 arm32 cross compile container Date: Wed, 6 Nov 2024 13:05:05 +0000 Message-ID: <5ffd2e88ebb473bbc6a9c89fb9cb63355822ec36.1730743077.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 user 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..01756bfcbf72 --- /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" +LABEL 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 @@ -422,7 +422,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 @@ -430,7 +430,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 @@ -438,7 +438,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 @@ -446,7 +446,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 @@ -454,7 +454,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 @@ -462,7 +462,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 Wed Nov 6 13:05:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javi Merino X-Patchwork-Id: 13864888 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 3029DD44D54 for ; Wed, 6 Nov 2024 13:16:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.830945.1246072 (Exim 4.92) (envelope-from ) id 1t8ft2-0000nH-GS; Wed, 06 Nov 2024 13:15:52 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 830945.1246072; Wed, 06 Nov 2024 13:15:52 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t8ft2-0000l5-BT; Wed, 06 Nov 2024 13:15:52 +0000 Received: by outflank-mailman (input) for mailman id 830945; Wed, 06 Nov 2024 13:15:51 +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 1t8ft1-0000Zv-L5 for xen-devel@lists.xenproject.org; Wed, 06 Nov 2024 13:15:51 +0000 Received: from mail-ed1-x535.google.com (mail-ed1-x535.google.com [2a00:1450:4864:20::535]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ca6ef5a1-9c3f-11ef-a0c6-8be0dac302b0; Wed, 06 Nov 2024 14:13:24 +0100 (CET) Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5c941623a5aso1557787a12.0 for ; Wed, 06 Nov 2024 05:07:48 -0800 (PST) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cee6a9a3e3sm2708939a12.12.2024.11.06.05.05.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2024 05:05:25 -0800 (PST) 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: ca6ef5a1-9c3f-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo1MzUiLCJoZWxvIjoibWFpbC1lZDEteDUzNS5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6ImNhNmVmNWExLTljM2YtMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMwODk4OTA4LjExNjE2Nywic2VuZGVyIjoiamF2aS5tZXJpbm9AY2xvdWQuY29tIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1730898325; x=1731503125; 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=IYRtBXHtmMvAiHP0ZMkvKUBKJ4wJh4GIX8aEfCSEVfs=; b=iIb5vJMsQu7OXrYkPhL6fGYhQx5GRBIzsK26f9HeB5F0n7myYvdeZR4cWGAi0x3vLG cGeUEVcOT/CkSG2dsLVnhLeNPszQp91MX8uIKKQlX5VU4owg7rDXUMvBpIe7a1YaOp9i FryP5E6liflgBbAV5bqj9OR1y68OqFKN3+0lY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730898325; x=1731503125; 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=IYRtBXHtmMvAiHP0ZMkvKUBKJ4wJh4GIX8aEfCSEVfs=; b=cr1nVcTD7NlePOnx5+vtH0GAgCM6vO756kDoSGLL1R9WJ2jvkg1Zqe2Alw2gn9tpZP tRGCvhy5B+C1IKk1m5k/3FsRlYwoWDV1ewUpsOKzO6PhEweq1Nc3XTKWgPgDk9OyEEUD Kskov8AD2U8Fa/xDrcL295wzQfPqW9/twbaUZlN6DMFecKnNzuTb5JmMmO1bhyvfPjwv HMecqmsLtlv6IsaOwOZU1e+3QdoH2WHs+veLmwcOYkvwPaS3OnZVld5G1z4HMHaf5xpk hPpTpFG2XRnKZ3KlCXlcTfqINSLcOQD2RZw46eIFilLprHfSptCsnE/pGqqWf6rzA2jH qNNg== X-Gm-Message-State: AOJu0YxFR4rdFMp/Q/ssVGXYGyJ3Q1JzIsfcFXnAXCy0lOmYDJ+HhCk7 mjMjnSGt7HqqS63nTSq4Rd1ntSQB2BJcbDC6KEvkwtqbmc2EXDTdfd+VOaPuxdxKVpkKTQt9G87 lI/k= X-Google-Smtp-Source: AGHT+IHC79vPV0iv5YoF1GyY6qEaluGz1BR00EHejTbobHaPynygyuJW4BnXPK14tPmiRf2U37Lm5A== X-Received: by 2002:a05:6402:2684:b0:5c9:85e8:ec8c with SMTP id 4fb4d7f45d1cf-5cef550779cmr3077911a12.6.1730898325515; Wed, 06 Nov 2024 05:05:25 -0800 (PST) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH v2 5/6] CI: Refresh the Debian 12 cppcheck container Date: Wed, 6 Nov 2024 13:05:06 +0000 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. User 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 --- .../debian/12-arm64v8-cppcheck.dockerfile | 79 +++++++++++++++++++ .../build/debian/bookworm-cppcheck.dockerfile | 54 ------------- automation/gitlab-ci/build.yaml | 12 +-- automation/scripts/containerize | 2 +- 4 files changed, 86 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..21c006e74f2e --- /dev/null +++ b/automation/build/debian/12-arm64v8-cppcheck.dockerfile @@ -0,0 +1,79 @@ +# 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: 13864927 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 34933D44D62 for ; Wed, 6 Nov 2024 13:38:21 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.831017.1246159 (Exim 4.92) (envelope-from ) id 1t8gEe-0001CI-4J; Wed, 06 Nov 2024 13:38:12 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 831017.1246159; Wed, 06 Nov 2024 13:38:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t8gEe-0001CA-0y; Wed, 06 Nov 2024 13:38:12 +0000 Received: by outflank-mailman (input) for mailman id 831017; Wed, 06 Nov 2024 13:38:11 +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 1t8gEd-00015Z-Jy for xen-devel@lists.xenproject.org; Wed, 06 Nov 2024 13:38:11 +0000 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [2a00:1450:4864:20::62a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 5b4d6f50-9c44-11ef-a0c6-8be0dac302b0; Wed, 06 Nov 2024 14:38:07 +0100 (CET) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a9eaf93e40dso356109966b.0 for ; Wed, 06 Nov 2024 05:38:07 -0800 (PST) Received: from localhost.localdomain ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5cee6a9a3e3sm2708939a12.12.2024.11.06.05.05.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Nov 2024 05:05:25 -0800 (PST) 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: 5b4d6f50-9c44-11ef-a0c6-8be0dac302b0 X-Custom-Connection: eyJyZW1vdGVpcCI6IjJhMDA6MTQ1MDo0ODY0OjIwOjo2MmEiLCJoZWxvIjoibWFpbC1lajEteDYyYS5nb29nbGUuY29tIn0= X-Custom-Transaction: eyJpZCI6IjViNGQ2ZjUwLTljNDQtMTFlZi1hMGM2LThiZTBkYWMzMDJiMCIsInRzIjoxNzMwOTAwMjg3LjY5MTIwOCwic2VuZGVyIjoiamF2aS5tZXJpbm9AY2xvdWQuY29tIiwicmVjaXBpZW50IjoieGVuLWRldmVsQGxpc3RzLnhlbnByb2plY3Qub3JnIn0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1730900287; x=1731505087; 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=peW5Y0BE/jL0vQFydq7zr9i7yr2PvZQXqorRemV3er4=; b=km+GOEriso1AppnQLbfz/Mop2QcCUkeD6SlPWqyuuQqPg3BXxFhaf2+2CVehTh4X+v 38SnEpjZE3GgSdXkCoeiYuGfuwWgj4vyrkaQbdlaQYU2cLBmw7QcwXSMyki0/klwb9TG k2UihkbWIOJoMMlSKv7NUiKr1RfoUcxZERTLA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730900287; x=1731505087; 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=peW5Y0BE/jL0vQFydq7zr9i7yr2PvZQXqorRemV3er4=; b=R/dCREwzdSNh2I1gWAKCvGqb3nEMNMrrGtZDXkQ62IcLEkctP7rlpEk6muBmJMfEYI sKhXMwQXg3crb291UmnwIFRi9oO8qWDLg3z7pymGKc1/B8J+CdEVrXapmgkZNQteVBMK 7zd6eTJltr9o9p4uRRm4d8K3zbi6kOcTwx/nNDmxXheAMpTlte0xFpFoaB7855MuKVp4 NoaWE1v6YDWyuvsVkOA4rCBgO+3vJJn9mbQeKvY8j8wBlennrk7e0W/HdU8aw54OWBCg 0uKnKPC6GWSDpTzvg8gLmW1spSgsmPsRCsCIe39Osx0iNbDo8L+xDZ+ho5Qmt11bDOIL l9gw== X-Gm-Message-State: AOJu0YyE5ig0xu2FEAF7EngT44rJIo2VUaAJfIquqkjpL+HemV2aDE7V yKEDiir1ykPyHjl9VjRFFItdu2QEikSzq5l5Ln60MJNB6LPz4E5Vs9rztBnkhYFyo48PkJ5exF1 QmoI= X-Google-Smtp-Source: AGHT+IE4DeGUIKZP66PFcAsTbnGgrI+CzQUM2sfdqA9YjItR7oI4vwnPgzYyZ4Q2J7m6cPOM9oXRJw== X-Received: by 2002:a2e:be20:0:b0:2fb:4951:172 with SMTP id 38308e7fff4ca-2fcbdf5f742mr181913701fa.2.1730898326619; Wed, 06 Nov 2024 05:05:26 -0800 (PST) From: Javi Merino To: xen-devel@lists.xenproject.org Cc: Javi Merino , Doug Goldstein , Stefano Stabellini Subject: [XEN PATCH v2 6/6] CI: Don't use -y with apt-get update Date: Wed, 6 Nov 2024 13:05:07 +0000 Message-ID: <67fbec9dd324802e1a1c5e3c38ae7853ede35e86.1730743077.git.javi.merino@cloud.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: MIME-Version: 1.0 apt-get update refreshes the package lists. -y doesn't do anything here. It is needed for "apt-get install" or "apt-get upgrade" but not for apt-get update. Drop it. Signed-off-by: Javi Merino Acked-by: Andrew Cooper --- automation/build/debian/11-ppc64le.dockerfile | 2 +- automation/build/debian/11-riscv64.dockerfile | 2 +- automation/build/debian/12-ppc64le.dockerfile | 2 +- automation/build/debian/12-riscv64.dockerfile | 2 +- automation/build/debian/12-x86_64-gcc-ibt.dockerfile | 4 ++-- automation/build/ubuntu/16.04-x86_64.dockerfile | 2 +- automation/build/ubuntu/18.04-x86_64.dockerfile | 2 +- automation/build/ubuntu/20.04-x86_64.dockerfile | 2 +- automation/build/ubuntu/22.04-x86_64.dockerfile | 2 +- automation/build/ubuntu/24.04-x86_64.dockerfile | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/automation/build/debian/11-ppc64le.dockerfile b/automation/build/debian/11-ppc64le.dockerfile index d846b670d02c..385a0a071db2 100644 --- a/automation/build/debian/11-ppc64le.dockerfile +++ b/automation/build/debian/11-ppc64le.dockerfile @@ -13,7 +13,7 @@ RUN <