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