From patchwork Tue Nov 21 16:03:52 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: 13463345 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 61C6EC61D92 for ; Tue, 21 Nov 2023 16:07:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.637948.994091 (Exim 4.92) (envelope-from ) id 1r5THd-0002Ht-5U; Tue, 21 Nov 2023 16:07:29 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 637948.994091; Tue, 21 Nov 2023 16:07:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r5THd-0002He-28; Tue, 21 Nov 2023 16:07:29 +0000 Received: by outflank-mailman (input) for mailman id 637948; Tue, 21 Nov 2023 16:07:27 +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 1r5THb-00021p-GH for xen-devel@lists.xenproject.org; Tue, 21 Nov 2023 16:07:27 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 0fbbaa00-8888-11ee-9b0e-b553b5be7939; Tue, 21 Nov 2023 17:07:25 +0100 (CET) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40b2ad4953cso4230995e9.0 for ; Tue, 21 Nov 2023 08:07:25 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id x18-20020a05600c421200b00406443c8b4fsm21325335wmh.19.2023.11.21.08.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 08:07: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: 0fbbaa00-8888-11ee-9b0e-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700582845; x=1701187645; 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=vyHczbYeLDFcodZOosw2Bsnn9YyQbUPtyKgez7lH334=; b=cx9HQl6YymxWGOHPi5oF6bgbJi53aFxDVmkqDi6gLZZiH3PWUrAINCsHJLsy4er+4p zkR0hblAWhMJlCW5Lei+mEmmXPiq4KnkX2/PIejI8qR82rQV0cETY7YdGmnt4QzeJDZx zeN1iinRPHp6ulOERWzWYx6iX7c5XOc01yHMI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700582845; x=1701187645; 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=vyHczbYeLDFcodZOosw2Bsnn9YyQbUPtyKgez7lH334=; b=bDKp7OrN/fffyRyEVwkw1acfKmdg8Ulc/5xHWIXrUQE2LMyf8w+rvETobXvetw+F2a bRm2sbZvnUO2jn2dmLGmIBlU+hrwZrNxh2x9nKHwHOTm+FUgGkgqUGmPyfWEMJNxZ6YX AWbbj1TZ3Qro/Hw+Fme9bs5nVfQmL+ZBogOy0iSqtgFHc5b6hMkmMa5n7JoAKP2i0gzK UKRNiTZHfyvzpkOqE7a7OM+/TYev4ek/lHKhpaP30kf9GiDKOguvq5Y1H6sCDqRpBOd1 IYahMwHTgawar+tRrQVXe4RBdM0ZAFtMwpUuBshntz+GJd+8olCMCoyaN3wofKQTDVTI GuOQ== X-Gm-Message-State: AOJu0YwrbKKWn6QS96NkusiM8xfjEtYV6K8TZFvtsZC9UTWlfmP7XgoK tBQZJUH96LJiHO4j+5/vJByzKqvUs6guOKxSzQQ= X-Google-Smtp-Source: AGHT+IGF3zGNzPN2SUkbkGYb+XSaNlHF+zriNTQCshiisKof9rgKjrHKyQblHwnsxukotcqyYKYNtA== X-Received: by 2002:a05:600c:4743:b0:406:51a0:17ea with SMTP id w3-20020a05600c474300b0040651a017eamr2817864wmo.10.1700582844881; Tue, 21 Nov 2023 08:07:24 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 1/7] automation: remove CR characters from serial output Date: Tue, 21 Nov 2023 17:03:52 +0100 Message-ID: <20231121160358.8080-2-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121160358.8080-1-roger.pau@citrix.com> References: <20231121160358.8080-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 serial output file untouched. All usages of `tee` are adjusted to strip CR from the output. Fixes: 3030a73bf849 ('automation: add a QEMU based x86_64 Dom0/DomU test') Signed-off-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- Changes since v1: - Attempt to fix all usages of tee. --- automation/scripts/qemu-alpine-x86_64.sh | 5 ++++- automation/scripts/qemu-smoke-dom0-arm32.sh | 3 ++- automation/scripts/qemu-smoke-dom0-arm64.sh | 3 ++- automation/scripts/qemu-smoke-dom0less-arm32.sh | 3 ++- automation/scripts/qemu-smoke-dom0less-arm64.sh | 3 ++- automation/scripts/qemu-smoke-riscv64.sh | 2 +- automation/scripts/qemu-xtf-dom0less-arm64.sh | 3 ++- automation/scripts/qubes-x86-64.sh | 2 +- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 2 +- 9 files changed, 17 insertions(+), 9 deletions(-) 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 diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index e6f303064a83..281cae38b4bd 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -91,7 +91,8 @@ timeout -k 1 720 \ -no-reboot \ -device virtio-net-pci,netdev=n0 \ -netdev user,id=n0,tftp=./ \ - -bios /usr/lib/u-boot/qemu_arm/u-boot.bin |& tee ${serial_log} + -bios /usr/lib/u-boot/qemu_arm/u-boot.bin |& \ + tee ${serial_log} | sed 's/\r//' set -e (grep -q "Domain-0" ${serial_log} && grep -q "^/ #" ${serial_log}) || exit 1 diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 0bf5cfdc61f9..bb3d3a6a816e 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -104,7 +104,8 @@ timeout -k 1 720 \ -no-reboot \ -device virtio-net-pci,netdev=n0 \ -netdev user,id=n0,tftp=binaries \ - -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& tee smoke.serial + -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& \ + tee smoke.serial | sed 's/\r//' set -e (grep -q "Domain-0" smoke.serial && grep -q "BusyBox" smoke.serial) || exit 1 diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index fb8f044a51f6..737adaf1a9ad 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -137,7 +137,8 @@ timeout -k 1 240 \ -no-reboot \ -device virtio-net-pci,netdev=n0 \ -netdev user,id=n0,tftp=./ \ - -bios /usr/lib/u-boot/qemu_arm/u-boot.bin |& tee ${serial_log} + -bios /usr/lib/u-boot/qemu_arm/u-boot.bin |& \ + tee ${serial_log} | sed 's/\r//' set -e (grep -q "${dom0_prompt}" ${serial_log} && grep -q "${passed}" ${serial_log}) || exit 1 diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index 75f575424a4e..b5ce7efdd44e 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -201,7 +201,8 @@ timeout -k 1 240 \ -no-reboot \ -device virtio-net-pci,netdev=n0 \ -netdev user,id=n0,tftp=binaries \ - -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& tee smoke.serial + -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& \ + tee smoke.serial | sed 's/\r//' set -e (grep -q "^Welcome to Alpine Linux" smoke.serial && grep -q "${passed}" smoke.serial) || exit 1 diff --git a/automation/scripts/qemu-smoke-riscv64.sh b/automation/scripts/qemu-smoke-riscv64.sh index 4008191302f9..f90df3c051e9 100755 --- a/automation/scripts/qemu-smoke-riscv64.sh +++ b/automation/scripts/qemu-smoke-riscv64.sh @@ -13,7 +13,7 @@ qemu-system-riscv64 \ -nographic \ -m 2g \ -kernel binaries/xen \ - |& tee smoke.serial + |& tee smoke.serial | sed 's/\r//' set -e (grep -q "All set up" smoke.serial) || exit 1 diff --git a/automation/scripts/qemu-xtf-dom0less-arm64.sh b/automation/scripts/qemu-xtf-dom0less-arm64.sh index 3ec9cf74e129..0c4578eda66e 100755 --- a/automation/scripts/qemu-xtf-dom0less-arm64.sh +++ b/automation/scripts/qemu-xtf-dom0less-arm64.sh @@ -61,7 +61,8 @@ timeout -k 1 120 \ -no-reboot \ -device virtio-net-pci,netdev=n0 \ -netdev user,id=n0,tftp=binaries \ - -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& tee smoke.serial + -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin |& \ + tee smoke.serial | sed 's/\r//' set -e (grep -q "${passed}" smoke.serial) || exit 1 diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 51323b1ae040..adec0f1f25c7 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -200,7 +200,7 @@ cp -f binaries/dom0-rootfs.cpio.gz $TFTP/initrd-dom0 # the console mkfifo /tmp/console-stdin cat /tmp/console-stdin |\ -ssh $CONTROLLER console | tee smoke.serial & +ssh $CONTROLLER console | tee smoke.serial | sed 's/\r//' & # start the system pointing at gitlab-ci predefined config ssh $CONTROLLER gitlabci poweron diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 075305241c8d..2bf786f6ee86 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -136,7 +136,7 @@ cd $START # connect to serial set +e stty -F /dev/ttyUSB0 115200 -timeout -k 1 120 nohup sh -c "cat /dev/ttyUSB0 | tee smoke.serial" +timeout -k 1 120 nohup sh -c "cat /dev/ttyUSB0 | tee smoke.serial | sed 's/\r//'" # stop the board cd /scratch/gitlab-runner From patchwork Tue Nov 21 16:03:53 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: 13463343 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 CCB7CC61D90 for ; Tue, 21 Nov 2023 16:07:40 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.637949.994101 (Exim 4.92) (envelope-from ) id 1r5THe-0002Xm-Fo; Tue, 21 Nov 2023 16:07:30 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 637949.994101; Tue, 21 Nov 2023 16:07:30 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r5THe-0002Xb-Ca; Tue, 21 Nov 2023 16:07:30 +0000 Received: by outflank-mailman (input) for mailman id 637949; Tue, 21 Nov 2023 16:07:29 +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 1r5THd-0002HT-0p for xen-devel@lists.xenproject.org; Tue, 21 Nov 2023 16:07:29 +0000 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [2a00:1450:4864:20::42e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 109b63d6-8888-11ee-98e1-6d05b1d4d9a1; Tue, 21 Nov 2023 17:07:27 +0100 (CET) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-32ddfb38c02so3846201f8f.3 for ; Tue, 21 Nov 2023 08:07:27 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id d16-20020adfe2d0000000b003316a2aedadsm14407752wrj.36.2023.11.21.08.07.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 08:07:26 -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: 109b63d6-8888-11ee-98e1-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700582846; x=1701187646; 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=iJZficHD89x4cEJe0EHwd87oUHCMM3lzh4Y4wqUEu3Q=; b=l9VAqEQpjoB+gyz75WfqPRkoIBG7614lQa0Yc5izp1AjYY8su0stG8vbeexj0vlCcU CMPKRcLwDSYR/YqQwS4wtIY6EAS6BTz/p6BdSRNoUGU/5r0HZ/08P5nPnzYaEsEe6y6I 1GoNJ23NSM9D1A0dLSTcN4R/jIam13rI/ZStc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700582846; x=1701187646; 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=iJZficHD89x4cEJe0EHwd87oUHCMM3lzh4Y4wqUEu3Q=; b=a1EVC4/MN5CtG1k7661AE6jKvCoHvkwtkcO5ryopcXBRABgWL4OLwSElVx3lN6aZDA O5gaTKGHMQer/D3etNELk58XBvE4KtRN5xNUFyay3GaAr88lfwLrznNnSjnNIH0y7Lya uEhKwhEPvBQWRNNa5paMXXwSBOCZ1VPafq0hV2yNmfjohd3BGeVd+3v7RoS8Bt08xnt6 x6gjAXxEFAUJbYckX3jnIC6MgpO30I8XRMMa9s5DVw6GlWrXTPjheXApQjhGznUwLH9c e/3KHJFL5CTOP4ww7uUAsiltOdmXfGU8zptealVregu5N4zTyvoi59zEZf8ZAETuV/En PomA== X-Gm-Message-State: AOJu0Yx0HCBs5jVLzGUr7fGWEr4kNOZ4QBhPuO/GZ0bDK2iMDN1xF/BE 7RcBlp/uaGQdCRhLgAGd8W6CzhUx4UCNfuZT7II= X-Google-Smtp-Source: AGHT+IH7cKHvp9kQ5KXLOWumVBLQF/PDgqIFuk4ArUeuEBBFhUOM4SrpBmaYA1loyOj3TMHAHnRHrA== X-Received: by 2002:adf:ce0c:0:b0:331:6c7a:73f with SMTP id p12-20020adfce0c000000b003316c7a073fmr7526716wrn.17.1700582846459; Tue, 21 Nov 2023 08:07:26 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 2/7] automation: remove com1= parameter on QEMU smoke tests Date: Tue, 21 Nov 2023 17:03:53 +0100 Message-ID: <20231121160358.8080-3-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121160358.8080-1-roger.pau@citrix.com> References: <20231121160358.8080-1-roger.pau@citrix.com> MIME-Version: 1.0 The serial is already setup by the firmware, be consistent with the rest of the QEMU tests and don't specify a com1 setup. Note it's also bogus, as the extra ',' will make the intended DPS argument to be parsed as the io-base. Signed-off-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- Changes in v2: - New in this version --- automation/scripts/qemu-smoke-x86-64.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/automation/scripts/qemu-smoke-x86-64.sh b/automation/scripts/qemu-smoke-x86-64.sh index 188ff8e3d658..3014d07314b9 100755 --- a/automation/scripts/qemu-smoke-x86-64.sh +++ b/automation/scripts/qemu-smoke-x86-64.sh @@ -19,8 +19,7 @@ set +e timeout -k 1 30 \ qemu-system-x86_64 -nographic -kernel binaries/xen \ -initrd xtf/tests/example/$k \ - -append "loglvl=all com1=115200,,8n1 console=com1 noreboot \ - console_timestamps=boot $extra" \ + -append "loglvl=all console=com1 noreboot console_timestamps=boot $extra" \ -m 512 -monitor none -serial file:smoke.serial set -e grep -q 'Test result: SUCCESS' smoke.serial || exit 1 From patchwork Tue Nov 21 16:03:54 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: 13463347 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 4124FC61D92 for ; Tue, 21 Nov 2023 16:07:48 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.637950.994110 (Exim 4.92) (envelope-from ) id 1r5THf-0002ob-Pn; Tue, 21 Nov 2023 16:07:31 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 637950.994110; Tue, 21 Nov 2023 16:07:31 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r5THf-0002oK-Ln; Tue, 21 Nov 2023 16:07:31 +0000 Received: by outflank-mailman (input) for mailman id 637950; Tue, 21 Nov 2023 16:07:30 +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 1r5THe-0002HT-5q for xen-devel@lists.xenproject.org; Tue, 21 Nov 2023 16:07:30 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 11f26ba8-8888-11ee-98e1-6d05b1d4d9a1; Tue, 21 Nov 2023 17:07:29 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-409299277bbso23519455e9.2 for ; Tue, 21 Nov 2023 08:07:29 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id m26-20020a05600c3b1a00b0040b2b38a1fasm1950957wms.4.2023.11.21.08.07.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 08:07:27 -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: 11f26ba8-8888-11ee-98e1-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700582849; x=1701187649; 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=/lNDRCElyOb258n1fKG7QxMoPmJ1R7ayXwBT54m1Rig=; b=FdQfT8Wu7jWhmvf3tNO4wsZ2chmhKoUmnlZGXM/d12gCF4KlYgRUuW0as6xfpgUaMR LV3SzN+dDjV6CIjb/Fhy0QyaQC74Ys9X4Qbz3Nnp6DonEEaGhPabmoch4npogbNoUqvx NIAySYR6uuz8M5aVFdF1gh+aVqTe0WtF84ihQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700582849; x=1701187649; 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=/lNDRCElyOb258n1fKG7QxMoPmJ1R7ayXwBT54m1Rig=; b=E+2IL5kl05MWLFFfhQ2eASQHXE1jOW9onsOD8pfJlnQKMxhnzK96Nv7OeOE8/cl6zZ /irbVGKKQRg2GZfq5zRaPKkpmHxCgfGucw5zOips4LJ+CcDnn00L5y0YZRujliehLobE lxWV5rFCCTI38SF/dkqXg0RNGOJFpuJgYtZI9Ej/VXnRiByMUpQFJ/YyQ1Qwuo4nf5Fr xAwaO4R0PjLSXQJNspVkBHCfd7UjzLP7QXdxLyVVAgegS0g1yyJtvVGdsSZ8c/bWAWem k4z5dVN0kTQtMYR0YFndQY51GBnMO39lPS2nl1xeyRmaMx3qqNOMkhfj+kK4Ibtl/ChB mepw== X-Gm-Message-State: AOJu0YyvfmOslf2d8QWe/Cv+S++gXoXo2k9l1Ht3Slrn5bFzJYsWsDEK 9K7pJr0Ice4tArBPSoQs3RXHWP7M+plI2X2kFLM= X-Google-Smtp-Source: AGHT+IG0JGH0X74kjT9rB/dTBZWAPOVFSXyvwrZVVW6hWpoBZM4xQMBtn0zfd+xCt195lg7P2JfNTQ== X-Received: by 2002:a05:600c:3b25:b0:407:3b6d:b561 with SMTP id m37-20020a05600c3b2500b004073b6db561mr7605929wms.9.1700582848784; Tue, 21 Nov 2023 08:07:28 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 3/7] automation: add Xen timestamps to all tests Date: Tue, 21 Nov 2023 17:03:54 +0100 Message-ID: <20231121160358.8080-4-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121160358.8080-1-roger.pau@citrix.com> References: <20231121160358.8080-1-roger.pau@citrix.com> MIME-Version: 1.0 Signed-off-by: Roger Pau Monné Reviewed-by: Stefano Stabellini --- Changes since v1: - Expand to all tests. --- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm32.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qemu-smoke-dom0less-arm32.sh | 2 +- automation/scripts/qemu-smoke-dom0less-arm64.sh | 2 +- automation/scripts/qemu-xtf-dom0less-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 2 +- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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 diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index 281cae38b4bd..a4b487b08055 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -63,7 +63,7 @@ XEN="xen-qemuarm" DOM0_KERNEL="zImage" DOM0_RAMDISK="initrd.gz" DOM0_CMD="console=hvc0 earlyprintk clk_ignore_unused root=/dev/ram0 rdinit=/sbin/init" -XEN_CMD="console=dtuart dom0_mem=1024M bootscrub=0" +XEN_CMD="console=dtuart dom0_mem=1024M bootscrub=0 console_timestamps=boot" NUM_DOMUS=0 diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index bb3d3a6a816e..e0bb37af3610 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -79,7 +79,7 @@ DEVICE_TREE="virt-gicv2.dtb" XEN="xen" DOM0_KERNEL="Image" DOM0_RAMDISK="xen-rootfs.cpio.gz" -XEN_CMD="console=dtuart dom0_mem=1024M" +XEN_CMD="console=dtuart dom0_mem=1024M console_timestamps=boot" NUM_DOMUS=0 diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 737adaf1a9ad..7e3cfbe9c4d0 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -89,7 +89,7 @@ MEMORY_END="0xC0000000" DEVICE_TREE="virt.dtb" XEN="xen" -XEN_CMD="console=dtuart dom0_mem=512M bootscrub=0" +XEN_CMD="console=dtuart dom0_mem=512M bootscrub=0 console_timestamps=boot" DOM0_KERNEL="vmlinuz" DOM0_RAMDISK="initrd.gz" diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index b5ce7efdd44e..e748b8ef1699 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -137,7 +137,7 @@ DEVICE_TREE="virt-gicv2.dtb" XEN="xen" DOM0_KERNEL="Image" DOM0_RAMDISK="dom0-rootfs.cpio.gz" -XEN_CMD="console=dtuart dom0_mem=512M" +XEN_CMD="console=dtuart dom0_mem=512M console_timestamps=boot" NUM_DOMUS=1 DOMU_KERNEL[0]="Image" diff --git a/automation/scripts/qemu-xtf-dom0less-arm64.sh b/automation/scripts/qemu-xtf-dom0less-arm64.sh index 0c4578eda66e..a667e0412c92 100755 --- a/automation/scripts/qemu-xtf-dom0less-arm64.sh +++ b/automation/scripts/qemu-xtf-dom0less-arm64.sh @@ -33,7 +33,7 @@ MEMORY_END="0xC0000000" XEN="xen" DEVICE_TREE="virt-gicv2.dtb" -XEN_CMD="console=dtuart" +XEN_CMD="console=dtuart console_timestamps=boot" DOMU_KERNEL[0]="xtf-test" DOMU_MEM[0]="128" diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index adec0f1f25c7..d81ed7b931cf 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -185,7 +185,7 @@ TFTP=/scratch/gitlab-runner/tftp CONTROLLER=control@thor.testnet echo " -multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G $extra_xen_opts +multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G console_timestamps=boot $extra_xen_opts module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen module2 (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 2bf786f6ee86..4a071c6ef148 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -94,7 +94,7 @@ DEVICE_TREE="mpsoc_smmu.dtb" XEN="xen" DOM0_KERNEL="Image" DOM0_RAMDISK="dom0-rootfs.cpio.gz" -XEN_CMD="console=dtuart dtuart=serial0 dom0_mem=1024M" +XEN_CMD="console=dtuart dtuart=serial0 dom0_mem=1024M console_timestamps=boot" NUM_DOMUS=1 DOMU_KERNEL[0]="Image" From patchwork Tue Nov 21 16:03:55 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: 13463344 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 0684CC61D85 for ; Tue, 21 Nov 2023 16:07:42 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.637951.994121 (Exim 4.92) (envelope-from ) id 1r5THh-00035N-3K; Tue, 21 Nov 2023 16:07:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 637951.994121; Tue, 21 Nov 2023 16:07: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 1r5THg-00035A-Vq; Tue, 21 Nov 2023 16:07:32 +0000 Received: by outflank-mailman (input) for mailman id 637951; Tue, 21 Nov 2023 16:07:31 +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 1r5THf-0002HT-Sj for xen-devel@lists.xenproject.org; Tue, 21 Nov 2023 16:07:31 +0000 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [2a00:1450:4864:20::436]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 13103ef7-8888-11ee-98e1-6d05b1d4d9a1; Tue, 21 Nov 2023 17:07:31 +0100 (CET) Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-32deb2809daso3806328f8f.3 for ; Tue, 21 Nov 2023 08:07:31 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id s5-20020a5d6a85000000b0032d9f32b96csm14853384wru.62.2023.11.21.08.07.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 08:07: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: 13103ef7-8888-11ee-98e1-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700582850; x=1701187650; 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=Zve9S/zNHdwBw2V30BXX0bI9hFa3laVbPQCXzgAwKZY=; b=azPRsnV+JIiizgLQB8SbiL3mOOeueurCv3iZiiR6VrU4dug2YnuvO+Wr5YxV005ZDs Lk4xRDgsdhr4EETJSxr3snmgiNovjeSfxQfwFhJ40UE5EuZ30dkWt2XucGnUzjINMgAr B4VQsmPxzUl3GZMktJ0tpgE7MzL6A0EslEU9U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700582850; x=1701187650; 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=Zve9S/zNHdwBw2V30BXX0bI9hFa3laVbPQCXzgAwKZY=; b=K3W+M4jfmuGB1mVLIsbXDSoU+dgl+hEsjA4pto/M9Tk/2qP2YNNJdrYJgLx30/lt+o sIW9zDSrx5QibXCJ4Mbo45bZLlfm0PuyLJcE2EMBn1+K3choGKGeMwlBjifxzJLQCU1f gCTnP0PDsmhmomfOcXjt4vi+Z6p4vHnl2M2eQxfJqN3qnAejVbbn830G7w8/YGcAmFV+ sVaQSCJgpGuY2cghBgmNMhaALRxfngJCwxD64jO2fka4W5v3K7DK5Hzte7Ie3aX4uFwJ Yg8syDkE6B9x5p6QJ4rouKZ9EsLSSyaVdGJz33C0qxF6qYLedv8Xw/+7YyJWo2UzmBfa q/QA== X-Gm-Message-State: AOJu0YxkU4EFtbQ2WKvTL0pyT8ocPMjHyyrvqY62ml38EDc91akB3LIU WR8yLDrjtWX+HFR1eybRDG0DFydf2yHiIoIw83s= X-Google-Smtp-Source: AGHT+IErMobG9xL0h/z8EpKFSlRL3LMKoISqgo9hKlJGkrTges2KLrZlwxs2ppW3XLytsTXK8kRhYg== X-Received: by 2002:adf:d1c3:0:b0:332:c60a:95b5 with SMTP id b3-20020adfd1c3000000b00332c60a95b5mr4203509wrd.54.1700582850088; Tue, 21 Nov 2023 08:07:30 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 4/7] automation: fix jessie/stretch images to use archive.debian.org apt repos Date: Tue, 21 Nov 2023 17:03:55 +0100 Message-ID: <20231121160358.8080-5-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121160358.8080-1-roger.pau@citrix.com> References: <20231121160358.8080-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 Tue Nov 21 16:03:56 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: 13463348 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 301F0C61D90 for ; Tue, 21 Nov 2023 16:07:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.637952.994130 (Exim 4.92) (envelope-from ) id 1r5THi-0003Mf-B8; Tue, 21 Nov 2023 16:07:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 637952.994130; Tue, 21 Nov 2023 16:07: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 1r5THi-0003Lg-6z; Tue, 21 Nov 2023 16:07:34 +0000 Received: by outflank-mailman (input) for mailman id 637952; Tue, 21 Nov 2023 16:07: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 1r5THh-0002HT-D1 for xen-devel@lists.xenproject.org; Tue, 21 Nov 2023 16:07:33 +0000 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [2a00:1450:4864:20::430]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 13cd31ab-8888-11ee-98e1-6d05b1d4d9a1; Tue, 21 Nov 2023 17:07:32 +0100 (CET) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-32f7c44f6a7so3812416f8f.1 for ; Tue, 21 Nov 2023 08:07:32 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id z5-20020adff745000000b0032d829e10c0sm14716194wrp.28.2023.11.21.08.07.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 08:07: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: 13cd31ab-8888-11ee-98e1-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700582852; x=1701187652; 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=OCV+1zq9A+e30W/W/psof5muStM/6Aej39H0kYZVYUo=; b=KvUMJ5HEJnAoolT8OLtvG2dlX9Rrr1kZAY1v1gRHaOaoXamPG9BjEuBMwtpPgRpc46 fBTCASG5i30v8pUCgm/uVmerxam1tGjTjK11jSj1kJB3Q6Z2QRu0MUp5F6uIg+yxPlTS P/WrmIwJ76HChz/svm2c6l/+UGFFWYU9tHoWw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700582852; x=1701187652; 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=OCV+1zq9A+e30W/W/psof5muStM/6Aej39H0kYZVYUo=; b=fH7jBATMR+eV5/SVQD+NUtghkfeVLCDBbGBXAGekLb9pX+oEQtPJhajKwoFiyilr3y aafqsplSdvmuP/U0142QTMmTA9fEuh+k2Axh0ykZUqKFmMkppN51gIKTM/6xpWsPJO6Y W2EoK+Tkl/+L5L/eak3AXzdZULi1f+lqGP1agQgaEeZFhPzrpv3l21t/g0Tz7LKNmLiV b6XbFaavKMN6qwosXh00ZQFHuCMcdZkX90k3LMpqJ7MrcHIEzEM7ymIwAt64bO+UW4Px Sqxfnyfg4dpiQpSOhNGssOYE0yt+6ROPzFjCEFYjtilR2Ky4/j+/VTJAKqmvWOS+NMR1 h5wg== X-Gm-Message-State: AOJu0YwMGCCN/MHckMIX98/PmyWbR0LfkSmYdolg7+vOawzDmJgX4ZGz 0J0QD/7kVYgIPLF+DiHHPlQ/bFljifHLfKsbVtE= X-Google-Smtp-Source: AGHT+IEQOv5XNaEPXVRMBZRZpRyl/CclL+IqVyae19Y0xgnqPjj+yBrIQEFhxFR0gPwVKEttSpeonQ== X-Received: by 2002:a5d:5f56:0:b0:332:c9ed:cc2c with SMTP id cm22-20020a5d5f56000000b00332c9edcc2cmr5672108wrb.3.1700582851919; Tue, 21 Nov 2023 08:07:31 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 5/7] automation: update tests to use Debian Bookworm Date: Tue, 21 Nov 2023 17:03:56 +0100 Message-ID: <20231121160358.8080-6-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121160358.8080-1-roger.pau@citrix.com> References: <20231121160358.8080-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 Tue Nov 21 16:03:57 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: 13463346 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 6E44EC61D85 for ; Tue, 21 Nov 2023 16:07:46 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.637953.994141 (Exim 4.92) (envelope-from ) id 1r5THk-0003h6-LX; Tue, 21 Nov 2023 16:07:36 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 637953.994141; Tue, 21 Nov 2023 16:07:36 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r5THk-0003gp-HR; Tue, 21 Nov 2023 16:07:36 +0000 Received: by outflank-mailman (input) for mailman id 637953; Tue, 21 Nov 2023 16:07: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 1r5THj-0002HT-9A for xen-devel@lists.xenproject.org; Tue, 21 Nov 2023 16:07:35 +0000 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [2a00:1450:4864:20::22e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 14a11839-8888-11ee-98e1-6d05b1d4d9a1; Tue, 21 Nov 2023 17:07:34 +0100 (CET) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2c5b7764016so69543181fa.1 for ; Tue, 21 Nov 2023 08:07:34 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id e22-20020a5d5956000000b0032dbf6bf7a2sm14749789wri.97.2023.11.21.08.07.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 08:07: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: 14a11839-8888-11ee-98e1-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700582853; x=1701187653; 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=8kmM/w/9TaHESzZwKotfNmIgZaxyBapwmYFaInyE/7U=; b=uMcSeF/wmhtKFVH608Sq/Hv+D7By8XCNaCPHkMlFLauc9lkwkUxxWxFZwFZnety0GL ftYxGNk2PDzShTA2TitKfFXlChRwYMiIgmM+XfyCu+dPlRko7Eat/v1ZYQbWagOGqdtc bC0/Erp7V+1UUUxEwrXpBem0FcqEaea5dtz+Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700582853; x=1701187653; 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=8kmM/w/9TaHESzZwKotfNmIgZaxyBapwmYFaInyE/7U=; b=OudTBkfBuZDKJMVtmYJEtWbL9WKmYNNLJRU12dZnb+9RhNOuxxF77qsvbekKHAZLM+ 4wWJro5dmKgFLJGSDrg2rivzPotrSEtHVRHmIm66k/83osxrZaRfV13P1hRFrM8awr4q LTuTWcM9Zoy4r2Ehk2yUhciCd0B1/hWm3YFBCLTVh5fEosHEqA78Cr+4K54EweT8FyUd rn5XY16POu3k2fO5I+DXK7HPHyvw+/4pekoSjgqqS8Tz9NHN81gtJyBUB3p/uxrJcP6r M4S4PY2eYBf2YWnFps7Nmd00+9+6vH59bL2yH9SoRsxapysMmowE4i+Z44RArup+8sy8 MDyQ== X-Gm-Message-State: AOJu0YzG6zcxn7OFnOrzp7herFJW+Sh9/hCNHTTyh3uZckUY/wmKKTLb JW1IXrYZEj7SZAVRxbp9bBXqTfeTPjrwKkle0mU= X-Google-Smtp-Source: AGHT+IEti2nzUVhLiGjNIqWupHd4+A2qCCmv+0UoxlYvYGtBpB0v4kKRNlfFBufraWVlyrAflSYKWA== X-Received: by 2002:a2e:2e10:0:b0:2c5:12c4:5ff with SMTP id u16-20020a2e2e10000000b002c512c405ffmr6899344lju.17.1700582853198; Tue, 21 Nov 2023 08:07:33 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 6/7] automation: set architecture in docker files Date: Tue, 21 Nov 2023 17:03:57 +0100 Message-ID: <20231121160358.8080-7-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121160358.8080-1-roger.pau@citrix.com> References: <20231121160358.8080-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é Reviewed-by: Stefano Stabellini --- 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 | 4 ++-- 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 +- automation/tests-artifacts/alpine/3.18.dockerfile | 2 +- automation/tests-artifacts/kernel/6.1.19.dockerfile | 2 +- .../tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile | 2 +- 20 files changed, 21 insertions(+), 21 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..6a3e50ef6b3f 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 @@ -41,7 +41,7 @@ RUN ./configure \ RUN make -j`nproc` && make -j`nproc` install -FROM debian:buster-slim +FROM --platform=linux/amd64 debian:buster-slim COPY --from=builder /opt/gcc-11-ibt /opt/gcc-11-ibt LABEL maintainer.name="The Xen Project" \ 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" diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile index 5f521572b8fb..f1b4a8b7a191 100644 --- a/automation/tests-artifacts/alpine/3.18.dockerfile +++ b/automation/tests-artifacts/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/tests-artifacts/kernel/6.1.19.dockerfile b/automation/tests-artifacts/kernel/6.1.19.dockerfile index d5b787c1cbb5..3a4096780d20 100644 --- a/automation/tests-artifacts/kernel/6.1.19.dockerfile +++ b/automation/tests-artifacts/kernel/6.1.19.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/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile index 7376ca46ff8e..65857147bf4f 100644 --- a/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.dockerfile +++ b/automation/tests-artifacts/qemu-system-ppc64/8.1.0-ppc64.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" From patchwork Tue Nov 21 16:03:58 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: 13463349 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 C8E47C61D85 for ; Tue, 21 Nov 2023 16:07:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.637954.994148 (Exim 4.92) (envelope-from ) id 1r5THl-0003pZ-CF; Tue, 21 Nov 2023 16:07:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 637954.994148; Tue, 21 Nov 2023 16:07: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 1r5THl-0003nc-4K; Tue, 21 Nov 2023 16:07:37 +0000 Received: by outflank-mailman (input) for mailman id 637954; Tue, 21 Nov 2023 16:07:36 +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 1r5THk-0002HT-1d for xen-devel@lists.xenproject.org; Tue, 21 Nov 2023 16:07:36 +0000 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [2a00:1450:4864:20::431]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 15733784-8888-11ee-98e1-6d05b1d4d9a1; Tue, 21 Nov 2023 17:07:35 +0100 (CET) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-332c82400a5so1480015f8f.0 for ; Tue, 21 Nov 2023 08:07:35 -0800 (PST) Received: from localhost ([213.195.113.99]) by smtp.gmail.com with ESMTPSA id m17-20020adfe0d1000000b0033130644c87sm14801636wri.54.2023.11.21.08.07.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 08:07: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: 15733784-8888-11ee-98e1-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1700582854; x=1701187654; 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=uEHkZfP8Vk93WUZy/CvbiKHsPZUEyAKQIBsJDl8fhZA=; b=ARgAfC65YO2TaSzWnhArNwfwfTo+mx8+c1zpqfGHMi+8HoRUj7eKjDwr0ZC2YgmFAF ZHg1r7l/myVAUeRIjOje5u6NdQzJMTQUb9xF+LjSGJ96sqJl7nUUpJU+J3alMz6EsXmQ xJ1hd5l3HK9Ko7p/ejE61yqk1LwlJW5HjElT8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700582854; x=1701187654; 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=uEHkZfP8Vk93WUZy/CvbiKHsPZUEyAKQIBsJDl8fhZA=; b=gc449QrB917dqc8sEIo17c9jL7hKXPnkZdWu7vfSBlMITNSWVsVCA3kflfhQiqAxBi aJ95/Wv2+uz5zlrn9YBplCp2AeLHVmrJJ5mL6v3iHiLGO8oWotmGjOa3IMeVgHVggB3W crfDxCdqiyHA6Ewd62Douy4oXa2SghJ0SgZiqOY0tXmauoqvxFxwkPKkjLN3hrH10TKY AiOYxy9sn6aCIoFMpzz1tRMK8QmFm5dhYLvx04R5+0+SsNwHEv1D8EKP/1AW8NpDZczN rMpZvWYeWZqU1z+U7GSh0HluvAozpKUBQvwzTqgFj9R6u2k3NT0JJBgQiy4B6X08KaPu niNQ== X-Gm-Message-State: AOJu0YzDEFHauUbBWnE6b33ukVszhE52beilRJ79IZL1DehtaHV+81ek ZXk1o8iSas52Hpi8fKFY+mts/m9wLo/fRIGnEMM= X-Google-Smtp-Source: AGHT+IGkrtAyvOGWa6GXLFYjUAB5u29bqv+S2LJhB5SrZlwIViqvtnMwT3R2dFPw6HJLE0pZ0kXbfA== X-Received: by 2002:a05:6000:4028:b0:32f:7fe4:45f2 with SMTP id cp40-20020a056000402800b0032f7fe445f2mr8713276wrb.4.1700582854590; Tue, 21 Nov 2023 08:07:34 -0800 (PST) From: Roger Pau Monne To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 7/7] automation: switch to multi-platform images when possible Date: Tue, 21 Nov 2023 17:03:58 +0100 Message-ID: <20231121160358.8080-8-roger.pau@citrix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231121160358.8080-1-roger.pau@citrix.com> References: <20231121160358.8080-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é Reviewed-by: Stefano Stabellini --- 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 | 4 ++-- automation/build/debian/bookworm-i386.dockerfile | 2 +- automation/build/debian/stretch-i386.dockerfile | 2 +- automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile | 2 +- automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile | 2 +- .../qemu-system-aarch64/6.0.0-arm64v8.dockerfile | 2 +- 9 files changed, 10 insertions(+), 10 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..633268376d56 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 @@ -24,7 +24,7 @@ RUN curl -fsSLO https://github.com/danmar/cppcheck/archive/"$CPPCHECK_VERSION".t FILESDIR=/usr/share/cppcheck \ HAVE_RULES=yes CXXFLAGS="-O2 -DNDEBUG -Wall -Wno-sign-compare -Wno-unused-function" -FROM arm64v8/debian:bookworm +FROM --platform=linux/arm64/v8 debian:bookworm COPY --from=builder /usr/bin/cppcheck /usr/bin/cppcheck COPY --from=builder /usr/share/cppcheck /usr/share/cppcheck 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" diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile index cbd96d9bc6b0..94f69621f40e 100644 --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile +++ b/automation/tests-artifacts/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/tests-artifacts/kernel/5.19-arm64v8.dockerfile b/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile index a53a97d7277e..b0875ca0ddd1 100644 --- a/automation/tests-artifacts/kernel/5.19-arm64v8.dockerfile +++ b/automation/tests-artifacts/kernel/5.19-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/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile index e277e13b60b9..fb7b7b506e94 100644 --- a/automation/tests-artifacts/qemu-system-aarch64/6.0.0-arm64v8.dockerfile +++ b/automation/tests-artifacts/qemu-system-aarch64/6.0.0-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"