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" ;;