From patchwork Thu Jul 11 21:05:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 13731058 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 AB9C1C3DA4A for ; Thu, 11 Jul 2024 21:05:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.757703.1166818 (Exim 4.92) (envelope-from ) id 1sS0z0-0003kP-BM; Thu, 11 Jul 2024 21:05:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 757703.1166818; Thu, 11 Jul 2024 21:05:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sS0z0-0003kI-8j; Thu, 11 Jul 2024 21:05:42 +0000 Received: by outflank-mailman (input) for mailman id 757703; Thu, 11 Jul 2024 21:05:41 +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 1sS0yz-0003kC-3c for xen-devel@lists.xenproject.org; Thu, 11 Jul 2024 21:05:41 +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 53715a3d-3fc9-11ef-bbfb-fd08da9f4363; Thu, 11 Jul 2024 23:05:39 +0200 (CEST) Received: by mail-ed1-x52e.google.com with SMTP id 4fb4d7f45d1cf-58ba3e37feeso1619107a12.3 for ; Thu, 11 Jul 2024 14:05:40 -0700 (PDT) Received: from andrewcoop.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-594bc3f29d2sm3858602a12.41.2024.07.11.14.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Jul 2024 14:05: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: 53715a3d-3fc9-11ef-bbfb-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1720731939; x=1721336739; 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=hIJUjPuUxWvZ2Xd5AJQXA1yC+F0y1g/OHIYvnMwTMu8=; b=Et4sqDPVtaDDYIjm2X4tz04ueF2JntX3LGw+QhfrWuRoz4R4x86ep8cnRvkGfuvxTJ beoOJiymBcTwadY+D3/J3TWxKobCg7G4cwkkaZUJ27qaa/FtxdJCbPHOa30o28B9nnzk h8ryXXtrIug59CMzJEEwye2tzcjF35KJVhcNs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720731939; x=1721336739; 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=hIJUjPuUxWvZ2Xd5AJQXA1yC+F0y1g/OHIYvnMwTMu8=; b=KFaHRQpR4RULpPP9ojvbmMme6wA9vR7u6quxOEuJ/dUTXkplOlXnD/AQ1CToCJSztd pqptHqrGSq9SiKUotDGTG+ybOY6JkygqUyPaYIi6jpzqGgzP9O937iIew++/0W6g8Ong qTTGyWSm+CaJbq5bO1yDwq1xLPXysEV75H9Tb30PP98eFmei8ARhb1Gv1zpX9e9YX6N+ 2rj2PZu2wBnJxT89zbYlRU1b22Z7xKPYRPIHg1DyzEEwHEZmaK5S4CTECODxP8YXsJWO Nn6krtCRlZu/iLh+gZW+1w11ZzZuvhsLyqeXhOyz/cBuvGf7cmQkwaG3l0wCLunXaViV 4Mig== X-Gm-Message-State: AOJu0Ywn4qNlTDh/PtoRRv5cWbGOAj6rAp19z+xt9cS0prbCuw7VEHtT 3FMIXDmQH7cd+gooHBgPmpfPQB6AhcMSx00klKKlaGht68se28XlrhJ9oWhmVK4ecTwDxMhYatn j X-Google-Smtp-Source: AGHT+IFWfZB2wCIe/k8b0kZ7imY/ZivkWYO0JHQ/rCmwAl2cjlOjCvwlwaEB1pHaHdZA09MTaBx43A== X-Received: by 2002:a05:6402:430b:b0:586:6365:b3cf with SMTP id 4fb4d7f45d1cf-594baf8728amr6846038a12.10.1720731938642; Thu, 11 Jul 2024 14:05:38 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Juergen Gross , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Jan Beulich , Stefano Stabellini , Julien Grall , Oleksii Kurochko , Shawn Anastasio , Olaf Hering Subject: [PATCH 14/12] CI: Refresh OpenSUSE Leap container Date: Thu, 11 Jul 2024 22:05:34 +0100 Message-Id: <20240711210534.3141725-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240711111517.3064810-1-andrew.cooper3@citrix.com> References: <20240711111517.3064810-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 See prior patch for most discussion. Despite appearing to a fixed release (and therefore not marked as permitted failure), the dockerfile references the `leap` tag which is rolling in practice. Switch to 15.6 explicitly, for better test stability. Vs tumbleweed, use `zypper update` rather than dist-upgrade, and retain the RomBIOS dependencies; bin86 and dev86. In terms of size, this saves ~700M: registry.gitlab.com/xen-project/xen/opensuse leap-15.6-x86_64 1.33GB registry.gitlab.com/xen-project/xen/suse opensuse-leap 2.05GB Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Juergen Gross CC: Roger Pau Monné CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Oleksii Kurochko CC: Shawn Anastasio CC: Olaf Hering Runs with this new container: 4.19: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7322493460 4.16: https://gitlab.com/xen-project/people/andyhhp/xen/-/jobs/7322499881 --- .../opensuse/leap-15.6-x86_64.dockerfile | 79 +++++++++++++++++++ .../build/suse/opensuse-leap.dockerfile | 75 ------------------ automation/gitlab-ci/build.yaml | 16 ++-- automation/scripts/containerize | 2 +- 4 files changed, 88 insertions(+), 84 deletions(-) create mode 100644 automation/build/opensuse/leap-15.6-x86_64.dockerfile delete mode 100644 automation/build/suse/opensuse-leap.dockerfile diff --git a/automation/build/opensuse/leap-15.6-x86_64.dockerfile b/automation/build/opensuse/leap-15.6-x86_64.dockerfile new file mode 100644 index 000000000000..562006672a4e --- /dev/null +++ b/automation/build/opensuse/leap-15.6-x86_64.dockerfile @@ -0,0 +1,79 @@ +# syntax=docker/dockerfile:1 +FROM --platform=linux/amd64 opensuse/leap:15.6 +LABEL maintainer.name="The Xen Project" +LABEL maintainer.email="xen-devel@lists.xenproject.org" + +ENV XEN_TARGET_ARCH=x86_64 + +RUN <