From patchwork Thu Nov 16 12:13:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13457840 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 ED56CC197A0 for ; Thu, 16 Nov 2023 12:13:54 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.634148.989450 (Exim 4.92) (envelope-from ) id 1r3bFW-00043W-DM; Thu, 16 Nov 2023 12:13:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 634148.989450; Thu, 16 Nov 2023 12:13:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r3bFW-00043P-AJ; Thu, 16 Nov 2023 12:13:34 +0000 Received: by outflank-mailman (input) for mailman id 634148; Thu, 16 Nov 2023 12:13:33 +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 1r3bFV-0003ma-2r for xen-devel@lists.xenproject.org; Thu, 16 Nov 2023 12:13:33 +0000 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [2a00:1450:4864:20::433]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8e473f31-8479-11ee-9b0e-b553b5be7939; Thu, 16 Nov 2023 13:13:31 +0100 (CET) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32ddfb38c02so496864f8f.3 for ; Thu, 16 Nov 2023 04:13:30 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id z11-20020a056000110b00b003143c9beeaesm13469331wrw.44.2023.11.16.04.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 04:13:29 -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: 8e473f31-8479-11ee-9b0e-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700136810; x=1700741610; 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=zL5mcmdb0pBxZaBE+peKARaW7+tFOaxVmIA77QUjENw=; b=LqOY6Cme04sVftjt+X+xb05wZeOXogVT3WYBdk568ZyxkyKpP7NitcVjGR8dvF7CQt AM5VZKdm2D1nzbpNfImH5PXkOUCFW8Mi0PTITfx109avFsrwrza8+Xy3ZjCWvny/e2/L 5CKvNxwT+O1rlFhWZnJS93GGVqu4Qjp1jkh4U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700136810; x=1700741610; 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=zL5mcmdb0pBxZaBE+peKARaW7+tFOaxVmIA77QUjENw=; b=m++wW5pRDPE2I/MEgiR7PQH+jlcmwrRyG+2GCiJdAuM57WEY7JAeh2TPLw7gMZyfO5 qP7+e9gsyROIpeiDHHOnqt1g4oaXLku4iBEkIvafyHtXL8xh+FGUf9uuu2KZxES5fi35 TzCyrAM/7PCCJcPkltNBUBLgXM0zfgPHRtW2zHh1AIyjNbwioS30CVh4ns+Qlr/00IxP Gxq1T/lisnc0lLSzoilYIBXF5+9Dc+4Q2MHjt5+rISvOiRmzhC6ZZ0gXWjiZxxm+aTea plVt6dO79jSN2qGlAXxaXQPhXg7dibGrCk1qtPWBhoNzg1q3Kt+warrvDZ7HeiIU+S41 D4CQ== X-Gm-Message-State: AOJu0Yz5wU3Hsgq8rteYnHakXyv+PGRh1ZP6jSMWC/bWtIvyy7yY71E3 fi7SznIznokvBLu+99UVEnmzD5VblqhsHi/ZIEE= X-Google-Smtp-Source: AGHT+IEo1RVeCgBxEJ5tYFcMYqOGVHo9R+DcD+BVOVKAJgmuCp+N0l0fDnv688F8uEIdEqz6XnAZUQ== X-Received: by 2002:a05:6000:156b:b0:32f:bed7:ed82 with SMTP id 11-20020a056000156b00b0032fbed7ed82mr2254340wrz.4.1700136809833; Thu, 16 Nov 2023 04:13:29 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH 1/6] automation: remove CR characters from QEMU serial Date: Thu, 16 Nov 2023 13:13:05 +0100 Message-ID: <20231116121310.72210-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231116121310.72210-1-roger.pau@citrix.com> References: <20231116121310.72210-1-roger.pau@citrix.com> MIME-Version: 1.0 The gitlab CI webpage seems to have issues displaying the \CR\CR\LF "\r\r\n" sequence on the web interface used as line returns by the Linux kernel serial output. This leads to the QEMU tests output looking like: (XEN) Guest Loglevel: Nothing (Rate-limited: Errors and warnings) (XEN) *** Serial input to DOM0 (type 'CTRL-a' three times to switch input) (XEN) Freed 664kB init memory mapping kernel into physical memory about to get started... qemu-system-x86_64: terminating on signal 15 from pid 52 (timeout) This not helpful, so strip the CR characters from the output that goes to stdout, leaving the output in the smoke.serial untouched. Fixes: 3030a73bf849 ('automation: add a QEMU based x86_64 Dom0/DomU test') Signed-off-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- automation/scripts/qemu-alpine-x86_64.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 8c8d0b0cd759..a1c41c030a47 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -84,7 +84,10 @@ qemu-system-x86_64 \ -monitor none -serial stdio \ -nographic \ -device virtio-net-pci,netdev=n0 \ - -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0 |& tee smoke.serial + -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0 |& \ + # Remove carriage returns from the stdout output, as gitlab + # interface chokes on them + tee smoke.serial | sed 's/\r//' set -e (grep -q "Domain-0" smoke.serial && grep -q "BusyBox" smoke.serial) || exit 1 From patchwork Thu Nov 16 12:13:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13457837 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 658B7C5AD4C for ; Thu, 16 Nov 2023 12:13:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.634147.989440 (Exim 4.92) (envelope-from ) id 1r3bFV-0003oP-8Z; Thu, 16 Nov 2023 12:13:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 634147.989440; Thu, 16 Nov 2023 12:13:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r3bFV-0003oE-3T; Thu, 16 Nov 2023 12:13:33 +0000 Received: by outflank-mailman (input) for mailman id 634147; Thu, 16 Nov 2023 12:13:32 +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 1r3bFU-0003ZM-A8 for xen-devel@lists.xenproject.org; Thu, 16 Nov 2023 12:13:32 +0000 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [2a00:1450:4864:20::433]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8ecdab3b-8479-11ee-98db-6d05b1d4d9a1; Thu, 16 Nov 2023 13:13:31 +0100 (CET) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-32ddfb38c02so496875f8f.3 for ; Thu, 16 Nov 2023 04:13:31 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id p1-20020a5d48c1000000b0032f933556b8sm13482302wrs.7.2023.11.16.04.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 04:13:31 -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: 8ecdab3b-8479-11ee-98db-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700136811; x=1700741611; 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=vjlhZh+sLdNk7wcLFSKpl0cKtv3ClZ49wgL2gB3Kgko=; b=JBnliYI39CYgsYQ+iqaJF6QiA/hmk+GHk4xzvQUDNHZVjURHC4u6l+4p5Fnm4/2G+Z bbd6AIqZ/+xmeQOksNL4zhLYJhU0AsTTGNk6gUEjJtU+/kYxwWvIZVheWUwmw2gwWEAT eaWr6yke+TwqjzguPvd+fOU7jtKrspvHS5baw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700136811; x=1700741611; 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=vjlhZh+sLdNk7wcLFSKpl0cKtv3ClZ49wgL2gB3Kgko=; b=FUa/XBcpo7xH2u27itBU1asd2cWRsg9Miaq0AnGtwgZe1UB4fXR6QuxY9mGsGhf0H4 p1uLGNYZhoKlWOAXrDnCyw60CX6W9VB3ZLcPzL4e8grKt6PCez4Pb70YjNDuBsLVrokW hCaRj5Eq2/UtIKYVBcUUjQvr08wIo+H67MuvM1q+kVwM0EJs406Ed8ykutbALkZAEJ/3 LWn3XuvbNLIUFUwmzYoIXBB1YjFM4zSHIVMwdZjDbbCqLO3owKyFgabHcTBV2QNaCoK+ pqrwTMv1wUXzVCAPmCQtrNYDvapi+qRUnrCclLdrVzXyZ4bfyMcotvrR923bYA27RbW0 dU5Q== X-Gm-Message-State: AOJu0YzM05B9EzbQSr9lD81oEZzktqG6V9v+5Vwybasjkdtj7FGrp962 R9u5xUfcWjbIWFcYDVcMwNSr3BFuEhr2e10TIDY= X-Google-Smtp-Source: AGHT+IECWTu53i91pW224J9uL28axZTnvLhWRbfdvBGTv53IjXCuJYnMj8FQOHa0uMlQuAQco2t+TQ== X-Received: by 2002:adf:d1cf:0:b0:32d:819d:ec75 with SMTP id b15-20020adfd1cf000000b0032d819dec75mr1758594wrd.60.1700136811239; Thu, 16 Nov 2023 04:13:31 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH 2/6] automation: add timestamps to QEMU non-smoke x86-64 test Date: Thu, 16 Nov 2023 13:13:06 +0100 Message-ID: <20231116121310.72210-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231116121310.72210-1-roger.pau@citrix.com> References: <20231116121310.72210-1-roger.pau@citrix.com> MIME-Version: 1.0 Signed-off-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- automation/scripts/qemu-alpine-x86_64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index a1c41c030a47..8e398dcea34b 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -68,7 +68,7 @@ cd ../.. cat >> binaries/pxelinux.0 << EOF #!ipxe -kernel xen console=com1 +kernel xen console=com1 console_timestamps=boot module bzImage console=hvc0 module xen-rootfs.cpio.gz boot From patchwork Thu Nov 16 12:13:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13457836 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 0640BC54FB9 for ; Thu, 16 Nov 2023 12:13:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.634149.989459 (Exim 4.92) (envelope-from ) id 1r3bFX-0004JM-K3; Thu, 16 Nov 2023 12:13:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 634149.989459; Thu, 16 Nov 2023 12:13:35 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r3bFX-0004JF-Gp; Thu, 16 Nov 2023 12:13:35 +0000 Received: by outflank-mailman (input) for mailman id 634149; Thu, 16 Nov 2023 12:13:33 +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 1r3bFV-0003ZM-Oe for xen-devel@lists.xenproject.org; Thu, 16 Nov 2023 12:13:33 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8f9e50a9-8479-11ee-98db-6d05b1d4d9a1; Thu, 16 Nov 2023 13:13:33 +0100 (CET) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40a48775c58so5886665e9.3 for ; Thu, 16 Nov 2023 04:13:33 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id o16-20020adfe810000000b0032326908972sm13472921wrm.17.2023.11.16.04.13.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 04:13:32 -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: 8f9e50a9-8479-11ee-98db-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700136812; x=1700741612; 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=H0bmgl9yK7YH8+Hj03ggPyfIEX7PvitHOBp8VhTAhFU=; b=lErMVfPjCebdMH8ZrhWs3D0qAx0ECKrXj11C+k0NCUidAtZuf/9EUTyZTUyLOF02lN 2GiQyB4VdiqdjyyIaFdDagXY4tbUoGZhDVZNwkpWj7Bs/nryQcSX8+bfe6qTBaevNI1k pnUgFbKgCtJUbwT5oWkxAa4p/T8vTN7yf9Rcc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700136812; x=1700741612; 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=H0bmgl9yK7YH8+Hj03ggPyfIEX7PvitHOBp8VhTAhFU=; b=pXsdZB3AmVIFg4C3DGyE4RT33znQibG+y2hcd1+j2ti8W267neRoNrsqbmDoHMSoaU TJTSDGHDc0BHl8HAjMEltz57xEROAjGVzP6rUxH5TAbkh+ofeVMqEVrLp7TjRZ+8jSHm dZ0wMaM+oUTflG+WFPEtAqILPq3QZiWZkqfhbImHnJT7aVyl/CLbtJHWHF0SyHwMkCcr qXnaAVWk3bHlwo9zHsm9HUR8MaMPau/n5GLd6L22HFuM3vHMX7js8w0NHVj2j6OabqkC OVkMA3O3fTHawlxSmHQpWYZMwOiUQ5TJj4mq7bxwZZHNQJNZLWKeGw+H+H+HIwr2uz0V //CA== X-Gm-Message-State: AOJu0YyiIE1PoKYcGfeciK0K5Xfe5v802qEv8zpwym4ap8ST7VprXjKF ST8VNBO17/ll+qSltAp/GYh3ksknA7+iuhOXJ7U= X-Google-Smtp-Source: AGHT+IETLbMti1Gyp8pApyF1dVt6a45SnxUHbphWpaGyU7mEM8/ccsOZ9Zl6ZDyB4U9b5STaukoGsw== X-Received: by 2002:a05:600c:1e11:b0:408:3f61:cb4f with SMTP id ay17-20020a05600c1e1100b004083f61cb4fmr1633844wmb.23.1700136812534; Thu, 16 Nov 2023 04:13:32 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH 3/6] automation: fix jessie/stretch images to use archive.debian.org apt repos Date: Thu, 16 Nov 2023 13:13:07 +0100 Message-ID: <20231116121310.72210-4-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231116121310.72210-1-roger.pau@citrix.com> References: <20231116121310.72210-1-roger.pau@citrix.com> MIME-Version: 1.0 Otherwise it's impossible to build the images. Signed-off-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- automation/build/debian/jessie-i386.dockerfile | 7 +++++++ automation/build/debian/jessie.dockerfile | 7 +++++++ automation/build/debian/stretch-i386.dockerfile | 7 +++++++ automation/build/debian/stretch.dockerfile | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/automation/build/debian/jessie-i386.dockerfile b/automation/build/debian/jessie-i386.dockerfile index c9ac15a3ffd6..a8dec82bb299 100644 --- a/automation/build/debian/jessie-i386.dockerfile +++ b/automation/build/debian/jessie-i386.dockerfile @@ -10,6 +10,13 @@ WORKDIR /build ENTRYPOINT ["linux32"] +# replace repos in archive as release is EOL +RUN cat <<"END" > /etc/apt/sources.list +deb http://archive.debian.org/debian/ jessie main contrib non-free +deb http://archive.debian.org/debian/ jessie-backports main contrib non-free +deb http://archive.debian.org/debian-security/ jessie/updates main contrib non-free +END + # build depends RUN apt-get update && \ apt-get --quiet --yes install \ diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile index 63b2c1e5b771..5c71c3e3ea75 100644 --- a/automation/build/debian/jessie.dockerfile +++ b/automation/build/debian/jessie.dockerfile @@ -8,6 +8,13 @@ ENV USER root RUN mkdir /build WORKDIR /build +# replace repos in archive as release is EOL +RUN cat <<"END" > /etc/apt/sources.list +deb http://archive.debian.org/debian/ jessie main contrib non-free +deb http://archive.debian.org/debian/ jessie-backports main contrib non-free +deb http://archive.debian.org/debian-security/ jessie/updates main contrib non-free +END + # build depends RUN apt-get update && \ apt-get --quiet --yes install \ diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile index d93f74c979ef..9739651e25dd 100644 --- a/automation/build/debian/stretch-i386.dockerfile +++ b/automation/build/debian/stretch-i386.dockerfile @@ -10,6 +10,13 @@ WORKDIR /build ENTRYPOINT ["linux32"] +# replace repos in archive as release is EOL +RUN cat <<"END" > /etc/apt/sources.list +deb http://archive.debian.org/debian/ stretch main contrib non-free +deb http://archive.debian.org/debian/ stretch-backports main contrib non-free +deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free +END + # build depends RUN apt-get update && \ apt-get --quiet --yes install \ diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile index 1af6c691f8f4..2f1a99f45017 100644 --- a/automation/build/debian/stretch.dockerfile +++ b/automation/build/debian/stretch.dockerfile @@ -8,6 +8,13 @@ ENV USER root RUN mkdir /build WORKDIR /build +# replace repos in archive as release is EOL +RUN cat <<"END" > /etc/apt/sources.list +deb http://archive.debian.org/debian/ stretch main contrib non-free +deb http://archive.debian.org/debian/ stretch-backports main contrib non-free +deb http://archive.debian.org/debian-security/ stretch/updates main contrib non-free +END + # build depends RUN apt-get update && \ apt-get --quiet --yes install \ From patchwork Thu Nov 16 12:13:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13457841 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 CF81AC54FB9 for ; Thu, 16 Nov 2023 12:13:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.634150.989470 (Exim 4.92) (envelope-from ) id 1r3bFZ-0004be-TA; Thu, 16 Nov 2023 12:13:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 634150.989470; Thu, 16 Nov 2023 12:13:37 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r3bFZ-0004bP-Q2; Thu, 16 Nov 2023 12:13:37 +0000 Received: by outflank-mailman (input) for mailman id 634150; Thu, 16 Nov 2023 12:13:35 +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 1r3bFX-0003ZM-JB for xen-devel@lists.xenproject.org; Thu, 16 Nov 2023 12:13:35 +0000 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [2a00:1450:4864:20::32f]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 90ba4f9a-8479-11ee-98db-6d05b1d4d9a1; Thu, 16 Nov 2023 13:13:35 +0100 (CET) Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40859c466efso5377755e9.3 for ; Thu, 16 Nov 2023 04:13:35 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id d15-20020a05600c34cf00b0040a4cc876e0sm3423038wmq.40.2023.11.16.04.13.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 04:13:33 -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: 90ba4f9a-8479-11ee-98db-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700136814; x=1700741614; 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=Yvxs/c3O2jbf+c3dkzntVo+nnu3OG0TuAlypeuFTsCQ=; b=hUo8t60oPjCyOv8NE3jRr4Mt7vUnqkE4DByMqYTDu24tYcP5433eknToBiUmpc0ntP xVrC9HEtbp4fJAT2+q3O0VMTS3Dn8wtnxC2YyLBN9XLfvFQlWaZWMMgdKzEVpjbDh8uj 9a7fGGcoF3f8Fzn8YR5tai+6r2Z5SoBBXHZNA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700136814; x=1700741614; 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=Yvxs/c3O2jbf+c3dkzntVo+nnu3OG0TuAlypeuFTsCQ=; b=GRMEc6HH+i+QvSzllKL75rptmjbYZ7ctXW1HfnFQ8BB71gaOr2KxVxtQWoFR6xCR49 WSA0yX7NpF7dNhVA195vaeJv07KvzzHX6IXFL2arRywiYi4mzzsXsKVspCu+xC0qVfJe qj3d7i+an9RymfPUIu/mamuxbahkVcVeQ9wGApWN2QJS6vRujkMjy/qQIb/b3x1OpfL6 h0WzFDrh6vMzw08CaOsDSg+axKfl9K+toX/aDGsO6nFMO/Wsuh6STb/2kt5Uk173GVXi nBEAOKwgo85GsPriMqUnnfhErb/KMNi/l/MegP8IY4tdDfCKGmFMzklbkxWDqblMDIR/ iIzg== X-Gm-Message-State: AOJu0YwzditB9/CXT1wTEmaflYNEAD4+X4jh+hnCiGAhpxje6hOYfl7m 726Dg9wg1eYTYVO/Sbpb7zWaYlusLtPJyZ59/0M= X-Google-Smtp-Source: AGHT+IHcjfD9BohIyQY2K+y2cqIQJaOKnG2gVdzpr0CxR0WvCRwk6X++0DLZnJtyAdnEd1q303cpCQ== X-Received: by 2002:a05:600c:470a:b0:404:f9c1:d5d7 with SMTP id v10-20020a05600c470a00b00404f9c1d5d7mr11670069wmo.25.1700136813831; Thu, 16 Nov 2023 04:13:33 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH 4/6] automation: update tests to use Debian Bookworm Date: Thu, 16 Nov 2023 13:13:08 +0100 Message-ID: <20231116121310.72210-5-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231116121310.72210-1-roger.pau@citrix.com> References: <20231116121310.72210-1-roger.pau@citrix.com> MIME-Version: 1.0 Switch tests using Stretch to Bookworm, as Stretch is EOL. Note the packages are not removed from the Stretch dockerfile, because the tests in stable branches will run using the old containers. Signed-off-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- The Bookworm container needs to be updated to contain the required tools before pushing this change. --- automation/build/debian/bookworm.dockerfile | 5 +++++ automation/gitlab-ci/test.yaml | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile index ae008c8d46e5..7aea081c13a9 100644 --- a/automation/build/debian/bookworm.dockerfile +++ b/automation/build/debian/bookworm.dockerfile @@ -46,6 +46,11 @@ RUN apt-get update && \ gnupg \ apt-transport-https \ golang \ + # for test phase, qemu-smoke-* jobs + qemu-system-x86 \ + # for test phase, qemu-alpine-* jobs + cpio \ + busybox-static \ && \ apt-get autoremove -y && \ apt-get clean && \ diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 61e642cce0cc..6aabdb9d156f 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -43,7 +43,7 @@ .qemu-x86-64: extends: .test-jobs-common variables: - CONTAINER: debian:stretch + CONTAINER: debian:bookworm LOGFILE: qemu-smoke-x86-64.log artifacts: paths: @@ -130,7 +130,7 @@ build-each-commit-gcc: extends: .test-jobs-common variables: - CONTAINER: debian:stretch + CONTAINER: debian:bookworm XEN_TARGET_ARCH: x86_64 CC: gcc script: From patchwork Thu Nov 16 12:13:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13457838 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 1DDE3C197A0 for ; Thu, 16 Nov 2023 12:13:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.634151.989480 (Exim 4.92) (envelope-from ) id 1r3bFb-0004tH-Af; Thu, 16 Nov 2023 12:13:39 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 634151.989480; Thu, 16 Nov 2023 12:13:39 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r3bFb-0004t8-7k; Thu, 16 Nov 2023 12:13:39 +0000 Received: by outflank-mailman (input) for mailman id 634151; Thu, 16 Nov 2023 12:13:38 +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 1r3bFZ-0003ma-Vw for xen-devel@lists.xenproject.org; Thu, 16 Nov 2023 12:13:37 +0000 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [2a00:1450:4864:20::435]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9168db25-8479-11ee-9b0e-b553b5be7939; Thu, 16 Nov 2023 13:13:36 +0100 (CET) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-32d81864e3fso478568f8f.2 for ; Thu, 16 Nov 2023 04:13:36 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id dl15-20020a0560000b8f00b003232380ffd7sm13379446wrb.102.2023.11.16.04.13.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 04:13:34 -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: 9168db25-8479-11ee-9b0e-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700136815; x=1700741615; 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=qIspCe97azur24wlxRrY8XemEwF0HzaBD9Iy98M0AxI=; b=dcUinvlT7E6naWPDoUd4Xi9x0ENDyD6mUdgBIcQEJr2OakMugKUkdoYMMsRpOYkM5a WyYS90Fck2AnAkXAGf57ZjO9P4v81QSszMVV0uNvlgjiYCTEq8Mkq+pmfIgR/3pPn0tG FH4qvujrDnrPxQhj1guyANNSadtN+DACHS6eo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700136815; x=1700741615; 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=qIspCe97azur24wlxRrY8XemEwF0HzaBD9Iy98M0AxI=; b=gME5c/6Xb7h9KpAXZZaU3CpZXXo2ri6tOooklza4ac4XxI+ntbLv5eZkelDNbsP4Yj kJWGwu/E7A3RCKE4+KuAivX5Ho7CYNjqbh4yrHqi7yZBUhjrICHLZ2BZU4fH85sA7gkP Nx8jHwrqPY2Q3P18SbcEhZxw8berOJHvZwjP5FHqowwGDgGDJvOBIG+PMigqmVhzPLcv MCS5aXTgbj8E8yA+VxAqAEyp2ryEPpNL4vTmk8MGxNkuNUcHyw+e1vjWXi7hvFSmv+l0 TPE8lcoE1wsJCtu+I4dSKq2xd35SWYEmQL+D0ps1btWLUIcYQouIUquMTuvaUOyDJQJg RKyw== X-Gm-Message-State: AOJu0YzBjQL8qylASnlThyfwxklnv87pvNEw9F0Ppd9S1Fo46QOhyAFg OAvWmO8RzbFY3pAIlD+wulq7sy+SxR3zCUGoxaw= X-Google-Smtp-Source: AGHT+IEg2sX+xnniGp39dWgTND5q0QxM53slzT80fjsMyrFYrVPNsCnrHPCgIzAWyFM3qz8+IMjFJQ== X-Received: by 2002:adf:ef4a:0:b0:32d:be44:f70c with SMTP id c10-20020adfef4a000000b0032dbe44f70cmr10183840wrp.7.1700136815072; Thu, 16 Nov 2023 04:13:35 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH 5/6] automation: set architecture in docker files Date: Thu, 16 Nov 2023 13:13:09 +0100 Message-ID: <20231116121310.72210-6-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231116121310.72210-1-roger.pau@citrix.com> References: <20231116121310.72210-1-roger.pau@citrix.com> MIME-Version: 1.0 Pass the desired architecture of the image in the FROM instruction if the image is possibly multi-platform. This allows using the x86 Dockerfiles on OS X on arm64 hardware. No functional change intended. Signed-off-by: Roger Pau Monné --- I haven't touched the Yocto dockerfile because I'm not sure how it's used. --- automation/build/alpine/3.18.dockerfile | 2 +- automation/build/archlinux/current-riscv64.dockerfile | 2 +- automation/build/archlinux/current.dockerfile | 2 +- automation/build/centos/7.dockerfile | 2 +- automation/build/debian/bookworm.dockerfile | 2 +- automation/build/debian/bullseye-ppc64le.dockerfile | 2 +- automation/build/debian/buster-gcc-ibt.dockerfile | 2 +- automation/build/debian/jessie.dockerfile | 2 +- automation/build/debian/stretch.dockerfile | 2 +- automation/build/fedora/29.dockerfile | 2 +- automation/build/suse/opensuse-leap.dockerfile | 2 +- automation/build/suse/opensuse-tumbleweed.dockerfile | 2 +- automation/build/ubuntu/bionic.dockerfile | 2 +- automation/build/ubuntu/focal.dockerfile | 2 +- automation/build/ubuntu/trusty.dockerfile | 2 +- automation/build/ubuntu/xenial-xilinx.dockerfile | 2 +- automation/build/ubuntu/xenial.dockerfile | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/automation/build/alpine/3.18.dockerfile b/automation/build/alpine/3.18.dockerfile index 5d2a69a06010..4ae9cb5e9e30 100644 --- a/automation/build/alpine/3.18.dockerfile +++ b/automation/build/alpine/3.18.dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18 +FROM --platform=linux/amd64 alpine:3.18 LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/archlinux/current-riscv64.dockerfile b/automation/build/archlinux/current-riscv64.dockerfile index abf8e7bf0b88..af75b5c720ce 100644 --- a/automation/build/archlinux/current-riscv64.dockerfile +++ b/automation/build/archlinux/current-riscv64.dockerfile @@ -1,4 +1,4 @@ -FROM archlinux +FROM --platform=linux/amd64 archlinux LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/archlinux/current.dockerfile b/automation/build/archlinux/current.dockerfile index 47e79637a4a6..d974a1434fd5 100644 --- a/automation/build/archlinux/current.dockerfile +++ b/automation/build/archlinux/current.dockerfile @@ -1,4 +1,4 @@ -FROM archlinux:base-devel +FROM --platform=linux/amd64 archlinux:base-devel LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/centos/7.dockerfile b/automation/build/centos/7.dockerfile index 69dcefb2f011..ab450f0b3a0e 100644 --- a/automation/build/centos/7.dockerfile +++ b/automation/build/centos/7.dockerfile @@ -1,4 +1,4 @@ -FROM centos:7 +FROM --platform=linux/amd64 centos:7 LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/bookworm.dockerfile b/automation/build/debian/bookworm.dockerfile index 7aea081c13a9..459f8e30bdc6 100644 --- a/automation/build/debian/bookworm.dockerfile +++ b/automation/build/debian/bookworm.dockerfile @@ -1,4 +1,4 @@ -FROM debian:bookworm +FROM --platform=linux/amd64 debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/bullseye-ppc64le.dockerfile b/automation/build/debian/bullseye-ppc64le.dockerfile index 4de8458445ae..6fdfb6bc2b40 100644 --- a/automation/build/debian/bullseye-ppc64le.dockerfile +++ b/automation/build/debian/bullseye-ppc64le.dockerfile @@ -1,4 +1,4 @@ -FROM debian:bullseye-slim +FROM --platform=linux/amd64 debian:bullseye-slim LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/buster-gcc-ibt.dockerfile b/automation/build/debian/buster-gcc-ibt.dockerfile index 96ab4fe8a2f1..4328c109b72b 100644 --- a/automation/build/debian/buster-gcc-ibt.dockerfile +++ b/automation/build/debian/buster-gcc-ibt.dockerfile @@ -1,4 +1,4 @@ -FROM debian:buster-slim AS builder +FROM --platform=linux/amd64 debian:buster-slim AS builder ENV DEBIAN_FRONTEND=noninteractive ENV USER root diff --git a/automation/build/debian/jessie.dockerfile b/automation/build/debian/jessie.dockerfile index 5c71c3e3ea75..32fc952fbc2d 100644 --- a/automation/build/debian/jessie.dockerfile +++ b/automation/build/debian/jessie.dockerfile @@ -1,4 +1,4 @@ -FROM debian/eol:jessie +FROM --platform=linux/amd64 debian/eol:jessie LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/stretch.dockerfile b/automation/build/debian/stretch.dockerfile index 2f1a99f45017..e2706a8f3589 100644 --- a/automation/build/debian/stretch.dockerfile +++ b/automation/build/debian/stretch.dockerfile @@ -1,4 +1,4 @@ -FROM debian:stretch +FROM --platform=linux/amd64 debian:stretch LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/fedora/29.dockerfile b/automation/build/fedora/29.dockerfile index e55b06a4517e..42a87ce6c84b 100644 --- a/automation/build/fedora/29.dockerfile +++ b/automation/build/fedora/29.dockerfile @@ -1,4 +1,4 @@ -FROM fedora:29 +FROM --platform=linux/amd64 fedora:29 LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/suse/opensuse-leap.dockerfile b/automation/build/suse/opensuse-leap.dockerfile index 7010b71acaa0..e1ec38a41445 100644 --- a/automation/build/suse/opensuse-leap.dockerfile +++ b/automation/build/suse/opensuse-leap.dockerfile @@ -1,4 +1,4 @@ -FROM opensuse/leap +FROM --platform=linux/amd64 opensuse/leap LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/suse/opensuse-tumbleweed.dockerfile b/automation/build/suse/opensuse-tumbleweed.dockerfile index 959e1f6939f0..38f6fda2ff1b 100644 --- a/automation/build/suse/opensuse-tumbleweed.dockerfile +++ b/automation/build/suse/opensuse-tumbleweed.dockerfile @@ -1,4 +1,4 @@ -FROM opensuse/tumbleweed +FROM --platform=linux/amd64 opensuse/tumbleweed LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/ubuntu/bionic.dockerfile b/automation/build/ubuntu/bionic.dockerfile index e15f54431efb..77d7f933860c 100644 --- a/automation/build/ubuntu/bionic.dockerfile +++ b/automation/build/ubuntu/bionic.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM --platform=linux/amd64 ubuntu:18.04 LABEL maintainer.name="The Xen Project " \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/ubuntu/focal.dockerfile b/automation/build/ubuntu/focal.dockerfile index e3d11194ee2f..30a9b8e84ffe 100644 --- a/automation/build/ubuntu/focal.dockerfile +++ b/automation/build/ubuntu/focal.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM --platform=linux/amd64 ubuntu:20.04 LABEL maintainer.name="The Xen Project " \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/ubuntu/trusty.dockerfile b/automation/build/ubuntu/trusty.dockerfile index 22e294c20cac..0d33578c4e1d 100644 --- a/automation/build/ubuntu/trusty.dockerfile +++ b/automation/build/ubuntu/trusty.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM --platform=linux/amd64 ubuntu:14.04 LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/ubuntu/xenial-xilinx.dockerfile b/automation/build/ubuntu/xenial-xilinx.dockerfile index 5f7087135213..49f27b322995 100644 --- a/automation/build/ubuntu/xenial-xilinx.dockerfile +++ b/automation/build/ubuntu/xenial-xilinx.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM --platform=linux/amd64 ubuntu:16.04 LABEL maintainer.name="The Xen Project " \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/ubuntu/xenial.dockerfile b/automation/build/ubuntu/xenial.dockerfile index 2d2ba3e31f63..e8035434f804 100644 --- a/automation/build/ubuntu/xenial.dockerfile +++ b/automation/build/ubuntu/xenial.dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM --platform=linux/amd64 ubuntu:16.04 LABEL maintainer.name="The Xen Project " \ maintainer.email="xen-devel@lists.xenproject.org" From patchwork Thu Nov 16 12:13:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Roger_Pau_Monn=C3=A9?= X-Patchwork-Id: 13457842 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 43EC9C5ACB3 for ; Thu, 16 Nov 2023 12:13:59 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.634152.989490 (Exim 4.92) (envelope-from ) id 1r3bFc-0005Ay-LB; Thu, 16 Nov 2023 12:13:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 634152.989490; Thu, 16 Nov 2023 12:13: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 1r3bFc-0005A6-H1; Thu, 16 Nov 2023 12:13:40 +0000 Received: by outflank-mailman (input) for mailman id 634152; Thu, 16 Nov 2023 12:13: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 1r3bFa-0003ma-W3 for xen-devel@lists.xenproject.org; Thu, 16 Nov 2023 12:13:39 +0000 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [2a00:1450:4864:20::22d]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 9207801e-8479-11ee-9b0e-b553b5be7939; Thu, 16 Nov 2023 13:13:37 +0100 (CET) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2c742186a3bso9207661fa.1 for ; Thu, 16 Nov 2023 04:13:37 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id j41-20020a05600c1c2900b00401e32b25adsm3546845wms.4.2023.11.16.04.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 04:13:36 -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: 9207801e-8479-11ee-9b0e-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700136816; x=1700741616; 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=vRJkkyFmkuBC8WFdcMa+KWUUy8Cc06O02MjHNIPMUf0=; b=K8IscRT3RHMNqlc1BTeuUwRLsSnPrRtVMv94tVRxsAqBXgXqoPMRFNAqx1Z9OdX/Eq NYAYRV20t9dK7uaPPWS3Nd8c39mAS9ZP1lfeL7GGWFQreKHvNIfw4pa3LxW/xoAe3jSt 8cVvQVlBBiiepo9N2b/KwUL4SuxezJTQdZens= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700136816; x=1700741616; 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=vRJkkyFmkuBC8WFdcMa+KWUUy8Cc06O02MjHNIPMUf0=; b=YhdRHzMr5xKArNYuQWXG/7JbR2BKvQLjdQOsJHC+WPIzFIjgj06eEICflfQ0rJiXm7 Bp3pcOx5AaO9zXb0sHFzg1p2EA7nKWhjwicMWeivrEYQfQPESzYOG2jPs46hitu9VxIA 1baibK+nmpT0gnqDLGLdn9JpsyU6d08lEn4uaGxQlvF07ZqltWcD1/KYFbqvLp09stsf 4mY8RdedhmTilJIsBRiQgWbnGJikqZN20xB/U6qqKV7uNf7iVrWvo7Zu4pecjNt5ihZI V8pn5lK1pW+s+13L071D0kWH3UI+3XW3FR1zygNJeGYTkeO+qoL22eaCIK1rQalsE8yg PSEw== X-Gm-Message-State: AOJu0Yylu1Vn58RB2k8jTxjbNbeoPsJ6BuMk0vKoAorjV9o8a71rKmvo p92KqmuQBFFC8oiEPBPtxV3QqIS+POSG7x5kCfQ= X-Google-Smtp-Source: AGHT+IGMtxxKv8jfrZgrGv0d8OB6C403oXIC6WXU5UmTXkOGUb+0rbuZgTEFO+uVplUMBDxb1pXEpQ== X-Received: by 2002:a2e:a592:0:b0:2c8:3571:b070 with SMTP id m18-20020a2ea592000000b002c83571b070mr8524414ljp.39.1700136816460; Thu, 16 Nov 2023 04:13:36 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH 6/6] automation: switch to multi-platform images when possible Date: Thu, 16 Nov 2023 13:13:10 +0100 Message-ID: <20231116121310.72210-7-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231116121310.72210-1-roger.pau@citrix.com> References: <20231116121310.72210-1-roger.pau@citrix.com> MIME-Version: 1.0 Instead of using specific architecture image, switch to using multi-arch ones and specify the desired architecture using the --platform option. Signed-off-by: Roger Pau Monné --- I haven't touched the Yocto dockerfile because I'm not sure how it's used. --- automation/build/alpine/3.18-arm64v8.dockerfile | 2 +- automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile | 2 +- automation/build/debian/bookworm-arm64v8.dockerfile | 2 +- automation/build/debian/bookworm-cppcheck.dockerfile | 2 +- automation/build/debian/bookworm-i386.dockerfile | 2 +- automation/build/debian/stretch-i386.dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile index 470f5d72a921..91e90220240f 100644 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ b/automation/build/alpine/3.18-arm64v8.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/alpine:3.18 +FROM --platform=linux/arm64/v8 alpine:3.18 LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile index b3295c435ed5..a05ffeac04f9 100644 --- a/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile +++ b/automation/build/debian/bookworm-arm64v8-arm32-gcc.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/debian:bookworm +FROM --platform=linux/arm64/v8 debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/bookworm-arm64v8.dockerfile b/automation/build/debian/bookworm-arm64v8.dockerfile index 640b1e0eadf2..2c432aacb765 100644 --- a/automation/build/debian/bookworm-arm64v8.dockerfile +++ b/automation/build/debian/bookworm-arm64v8.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/debian:bookworm +FROM --platform=linux/arm64/v8 debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/bookworm-cppcheck.dockerfile b/automation/build/debian/bookworm-cppcheck.dockerfile index d64fb7b18c66..d368d69472cb 100644 --- a/automation/build/debian/bookworm-cppcheck.dockerfile +++ b/automation/build/debian/bookworm-cppcheck.dockerfile @@ -1,4 +1,4 @@ -FROM arm64v8/debian:bookworm AS builder +FROM --platform=linux/arm64/v8 debian:bookworm AS builder ENV DEBIAN_FRONTEND=noninteractive ENV CPPCHECK_VERSION=2.7 diff --git a/automation/build/debian/bookworm-i386.dockerfile b/automation/build/debian/bookworm-i386.dockerfile index 559bf670f0f1..89a650338566 100644 --- a/automation/build/debian/bookworm-i386.dockerfile +++ b/automation/build/debian/bookworm-i386.dockerfile @@ -1,4 +1,4 @@ -FROM i386/debian:bookworm +FROM --platform=linux/i386 debian:bookworm LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org" diff --git a/automation/build/debian/stretch-i386.dockerfile b/automation/build/debian/stretch-i386.dockerfile index 9739651e25dd..da93fed8ea68 100644 --- a/automation/build/debian/stretch-i386.dockerfile +++ b/automation/build/debian/stretch-i386.dockerfile @@ -1,4 +1,4 @@ -FROM i386/debian:stretch +FROM --platform=linux/i386 debian:stretch LABEL maintainer.name="The Xen Project" \ maintainer.email="xen-devel@lists.xenproject.org"