From patchwork Fri Apr 11 20:32:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 14048730 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 0DD3EC369AB for ; Fri, 11 Apr 2025 20:33:51 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.947817.1345409 (Exim 4.92) (envelope-from ) id 1u3L4A-0007fF-0l; Fri, 11 Apr 2025 20:33:34 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 947817.1345409; Fri, 11 Apr 2025 20:33: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 1u3L49-0007f8-T4; Fri, 11 Apr 2025 20:33:33 +0000 Received: by outflank-mailman (input) for mailman id 947817; Fri, 11 Apr 2025 20:33:32 +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 1u3L48-0007cp-RF for xen-devel@lists.xenproject.org; Fri, 11 Apr 2025 20:33:32 +0000 Received: from fhigh-a3-smtp.messagingengine.com (fhigh-a3-smtp.messagingengine.com [103.168.172.154]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3a00fbd8-1714-11f0-9ffb-bf95429c2676; Fri, 11 Apr 2025 22:33:29 +0200 (CEST) Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfhigh.phl.internal (Postfix) with ESMTP id A29A11140173; Fri, 11 Apr 2025 16:33:28 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Fri, 11 Apr 2025 16:33:28 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 11 Apr 2025 16:33:27 -0400 (EDT) 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: 3a00fbd8-1714-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1744403608; x=1744490008; bh=4iAXFxKudp w79KKHm4Xqra3AFiuUM/rF5pT4LPi5aRE=; b=XC8Aoe4u9BPrN5JYKa/bepRK2A NWji5RJI/uVsVNMn1LTpYxKOPGszM6EWd6ftc4ZNreiGCBL2K5SwC7P8TjwrrKUl T5RHDL+imEHzziW3LpQby+SWIxVsypedg/IZUsKr7ACoCDbiTQQ0/c7vgFh+WaR3 MaruKL/YUAKt1WQPZ0iEwqUn1DJw5gIvvE0RBGQX5PivPpTw5KZooecb79Wsa7Pr wodADV0jaVd9f1zxnBpfmazG43Zu7/ufbVsxfu0GI3NYUt+UJXj+ZRHoxA5I+WUh sz6X1lyX4S4QCGBqVfYNAfYJ7cP/+rOheSwNnkdCklVvCxarEUiEij2GSx6A== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1744403608; x= 1744490008; bh=4iAXFxKudpw79KKHm4Xqra3AFiuUM/rF5pT4LPi5aRE=; b=E gd7UtamV+KVtvQteJw/4uarBTeV6ADUIcYffmzdesAgADvcbJ/S30olZ5EAwgLbH 2VVr3E60cuCTWy+culJmuB2//j2rbSK9OwPLUSlbvNbtjSzcZOqqMoBe/+4oAPLK DI/0vu3qf7mPn0eLQVvCcnMGS8yylJ9Eg26l8t3Bn2v/rzzwhCIGY3Oup5QzFilZ O2KwKcPqffeHEllJnr/v8SXc9T5raswJ72tGky08PDcZVPnrhPgLNTrOfCK9LBle w9yyii+b+2pkhIBB36uYJtAXqBEznMGMZyI/tOvlUElkPH66kFYxqg5oIjZOrLo7 M3sMvpWZBS6e0Fvx2q2lg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvuddvjeekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopegrnhgurhgvfidrtghoohhpvghrfeestghithhrihigrdgtohhmpdhrtghpthhtohep mhgrrhhmrghrvghksehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomhdprhgtph htthhopegtrghrughovgestggrrhguohgvrdgtohhmpdhrtghpthhtohepshhsthgrsggv lhhlihhniheskhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , =?utf-8?q?Marek_Marczykowski-?= =?utf-8?q?G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v3 1/7] CI: wait for Xen to start before waiting for test to complete Date: Fri, 11 Apr 2025 22:32:13 +0200 Message-ID: <3f1ef15b54a84573576e647314ec61ea43d4e3af.1744403499.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Add additional stage in console output parsing - wait for first message from Xen. The message is defined via BOOT_MSG variable. This has two effects: - distinguishes failing Xen to load at all from later test failures - resets timeout when Xen starts loading The latter is especially relevant for hardware tests where firmware + network boot may take some time before Xen starts booting. The two-stage timeout is more robust solution than increasing the overall timeout. The issue has been observed on some dom0pvh-hvm jobs, at least on runners hw3 and hw11. This patch is a first stage before qubes-x86-64.sh is switched to use expect in the next stage. While at it, consistently use 'expect -re' for all matches. This especially allows matching newlines ("\n"), which will become relevant in the next patch. And document variables used in console.exp. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper --- Changes in v3: - split off "CI: switch qubes runners to use console.exp" - use BOOT_MSG in more tests (all using network boot) --- automation/scripts/console.exp | 27 +++++++++++++--- automation/scripts/qemu-alpine-x86_64.sh | 1 +- automation/scripts/qemu-smoke-dom0-arm32.sh | 1 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 1 +- automation/scripts/qemu-smoke-dom0less-arm32.sh | 1 +- automation/scripts/qemu-xtf-dom0less-arm64.sh | 1 +- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 1 +- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 1 +- 8 files changed, 29 insertions(+), 5 deletions(-) diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index 31ce97b91b63..c27f893dfba7 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -1,4 +1,17 @@ #!/usr/bin/env expect +# +# Variables used by this script: +# - TEST_TIMEOUT: timeout between each *_MSG match +# - TEST_TIMEOUT_OVERRIDE: when set, overrides TEST_TIMEOUT +# - TEST_LOG: save console log to this file +# - TEST_CMD: commands that prints test system console output to stdout - in +# qemu tests that's usually qemu itself (with -serial stdio), in hardware +# tests that's a command to read serial console +# - UBOOT_CMD (optional): command to enter at u-boot prompt +# - BOOT_MSG (optional): initial Xen message to wait for (aka sign-of-life) +# - LOG_MSG (optional): final console message to wait for +# - PASSED: message to look for to consider test a success; if LOG_MSG is set, +# both LOG_MSG and PASSED must appear (in any order) for test to succeed if {[info exists env(TEST_TIMEOUT_OVERRIDE)]} { set timeout $env(TEST_TIMEOUT_OVERRIDE) @@ -28,21 +41,25 @@ if {[info exists env(UBOOT_CMD)]} { send "$env(UBOOT_CMD)\r" } +if {[info exists env(BOOT_MSG)]} { + expect -re "$env(BOOT_MSG)" +} + if {[info exists env(LOG_MSG)]} { expect { - "$env(PASSED)" { - expect "$env(LOG_MSG)" + -re "$env(PASSED)" { + expect -re "$env(LOG_MSG)" exit 0 } - "$env(LOG_MSG)" { - expect "$env(PASSED)" + -re "$env(LOG_MSG)" { + expect -re "$env(PASSED)" exit 0 } } } expect { - "$env(PASSED)" { + -re "$env(PASSED)" { exit 0 } } diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 17e2141d625e..89bdb4df7dac 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -85,6 +85,7 @@ export TEST_CMD="qemu-system-x86_64 \ -netdev user,id=n0,tftp=binaries,bootfile=/pxelinux.0" export TEST_LOG="smoke.serial" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Domain-0" export PASSED="BusyBox" diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index 0c60a66e25e3..4f50eabdef53 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -92,6 +92,7 @@ export TEST_CMD="./qemu-system-arm \ export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" export TEST_LOG="${serial_log}" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Domain-0" export PASSED="/ #" diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 8774a8701232..51d037b0003e 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -104,6 +104,7 @@ export TEST_CMD="./binaries/qemu-system-aarch64 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="smoke.serial" export LOG_MSG="Domain-0" export PASSED="BusyBox" diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh b/automation/scripts/qemu-smoke-dom0less-arm32.sh index 0c94e662aab9..0e2c5496db51 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh @@ -144,6 +144,7 @@ export TEST_CMD="./qemu-system-arm \ -bios /usr/lib/u-boot/qemu_arm/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="${serial_log}" export LOG_MSG="${dom0_prompt}" export PASSED="${passed}" diff --git a/automation/scripts/qemu-xtf-dom0less-arm64.sh b/automation/scripts/qemu-xtf-dom0less-arm64.sh index 9608de6ec033..436f460c3cb6 100755 --- a/automation/scripts/qemu-xtf-dom0less-arm64.sh +++ b/automation/scripts/qemu-xtf-dom0less-arm64.sh @@ -61,6 +61,7 @@ export TEST_CMD="./binaries/qemu-system-aarch64 \ -bios /usr/lib/u-boot/qemu_arm64/u-boot.bin" export UBOOT_CMD="virtio scan; dhcp; tftpb 0x40000000 boot.scr; source 0x40000000" +export BOOT_MSG="Latest ChangeSet: " export TEST_LOG="smoke.serial" export PASSED="${passed}" diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 7834ffbe0593..69caabe2d8ed 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -159,6 +159,7 @@ stty -F ${SERIAL_DEV} 57600 # Capture test result and power off board before exiting. export PASSED="${PASS_MSG}" +export BOOT_MSG="Latest ChangeSet: " export TEST_CMD="cat ${SERIAL_DEV}" export TEST_LOG="smoke.serial" diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index b24ad11b8cac..3e1fcf6bf93c 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -140,6 +140,7 @@ stty -F ${SERIAL_DEV} 115200 # Capture test result and power off board before exiting. export PASSED="${passed}" +export BOOT_MSG="Latest ChangeSet: " export LOG_MSG="Welcome to Alpine Linux" export TEST_CMD="cat ${SERIAL_DEV}" export TEST_LOG="smoke.serial" From patchwork Fri Apr 11 20:32:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 14048728 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 1683DC369A2 for ; Fri, 11 Apr 2025 20:33:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.947818.1345419 (Exim 4.92) (envelope-from ) id 1u3L4B-0007tv-Ax; Fri, 11 Apr 2025 20:33:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 947818.1345419; Fri, 11 Apr 2025 20:33: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 1u3L4B-0007tn-7M; Fri, 11 Apr 2025 20:33:35 +0000 Received: by outflank-mailman (input) for mailman id 947818; Fri, 11 Apr 2025 20:33: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 1u3L49-0007cp-GK for xen-devel@lists.xenproject.org; Fri, 11 Apr 2025 20:33:33 +0000 Received: from fout-a8-smtp.messagingengine.com (fout-a8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3addbbba-1714-11f0-9ffb-bf95429c2676; Fri, 11 Apr 2025 22:33:31 +0200 (CEST) Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.phl.internal (Postfix) with ESMTP id 15B6913801E9; Fri, 11 Apr 2025 16:33:30 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Fri, 11 Apr 2025 16:33:30 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 11 Apr 2025 16:33:28 -0400 (EDT) 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: 3addbbba-1714-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1744403610; x=1744490010; bh=qNI+VqSEj0 KVeZX4bXAfU5HaNIGKRMphh1Sp3jCnRHA=; b=BzyxJe66q6LlGJmm3GY41iiNJ3 9sHcabf5OYpHCrLeqFcfBCC8G2XK3rPSindGoQHvzfIzzAH2ktjdDbnp+lZ+7Y/d MIfOgGCI6pQLXpN/0r7fDhEYPbVyG9ZOBWPEzLbyEWTwn1K2eFiM30r4gvbxJlT0 AOBnRrmxu/YRGPL2Kp4o7LcjmZ2pa2cUOnxiggQO1dOI5MOekLDhuWcRfVy0VQka BcZkYq/TzYlfWM+eTllOr+TlV+d2iyIip1zQCbkPsndzrCcLb7QZ5s4IKz84rRXV qv4+VRD91dsUQWEEsT6ZI+RMewgFLueubTfQtLsnO3h3TUm2vkaLW9TuxlTA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1744403610; x= 1744490010; bh=qNI+VqSEj0KVeZX4bXAfU5HaNIGKRMphh1Sp3jCnRHA=; b=I 454Pl5J2bzBUXqCPqP+lZG4QXpDjlTyV2R2Ea9dupk/m7lRYdimfdg6FezRyVknT N8h1BMGXdwNKQM6OyO+6tdp+wucisHMrMzG2OgA6TP+mvRms2kcSmox5uKVheswz 38ahlpFmeLVlXUy+OVwPLB+mi098bxF29a02ao7NzVeUaZtTthKeVuWMWR3MygQR 2+9lz+Y96QoYeMjk6HPZvcv0+6DLr0fajM3Yagdj+JguTJLERMOoo+xfAAeFX1ue vMKrsQBp8vfjcZOjvbi/z6L7fG+hDIZ5KqE2yiaS9YcCT/Ai4Z2i7iM7jPwxD5mT b9DHZNMb5s+VBUNtiC00g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvuddvjeekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopegrnhgurhgvfidrtghoohhpvghrfeestghithhrihigrdgtohhmpdhrtghpthhtohep mhgrrhhmrghrvghksehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomhdprhgtph htthhopegtrghrughovgestggrrhguohgvrdgtohhmpdhrtghpthhtohepshhsthgrsggv lhhlihhniheskhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , =?utf-8?q?Marek_Marczykowski-?= =?utf-8?q?G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v3 2/7] CI: fix waiting for final test message Date: Fri, 11 Apr 2025 22:32:14 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Expect normally discards initial part of its buffer after matching the patter, before looking for the next one. If both PASSED and LOG_MSG happen to be in the buffer at the same time, depending on their order, only one will be matched and the waiting for the other will timeout. Example expect -d output of this happening (parts eclipsed for brevity): expect: does "\r\r\r\nWelcome to Alpine Linux 3.18\r\r\r\n...\r\r\r\r\n(domU) + echo 'pci test passed'\r\r\r\r\n(domU) pci test passed\r\r\r\r..." (spawn_id exp4) match regular expression "pci test passed"? Gate "pci test passed"? gate=yes re=yes ... Gate keeper glob pattern for '\nWelcome to Alpine Linux' is ' Welcome to Alpine Linux'. Activating booster. expect: does "'\r\r\r\r\n(domU) pci test passed\r\r\r\r\n(domU) [ ok ]\r\r\r\r\n(domU) [ ok ]\r\r\r\r\n(domU) \r\r\r\r\r\n(domU) domU Welcome to Alpine Linux 3.18\r\r\r\r\n(domU) \rKernel 6.6.56 on an x86_64 (/dev/hvc0)\r\r\r\r\n(domU) \r\r\r\r\r\n" (spawn_id exp4) match regular expression "\nWelcome to Alpine Linux"? Gate "\nWelcome to Alpine Linux"? gate=no Fix this by using -notransfer flag to keep matched part in the buffer. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Andrew Cooper --- automation/scripts/console.exp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index c27f893dfba7..834a08db1b95 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -48,11 +48,11 @@ if {[info exists env(BOOT_MSG)]} { if {[info exists env(LOG_MSG)]} { expect { -re "$env(PASSED)" { - expect -re "$env(LOG_MSG)" + expect -notransfer -re "$env(LOG_MSG)" exit 0 } -re "$env(LOG_MSG)" { - expect -re "$env(PASSED)" + expect -notransfer -re "$env(PASSED)" exit 0 } } From patchwork Fri Apr 11 20:32:15 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 14048729 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 F3655C369B2 for ; Fri, 11 Apr 2025 20:33:48 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.947819.1345423 (Exim 4.92) (envelope-from ) id 1u3L4B-0007wx-M0; Fri, 11 Apr 2025 20:33:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 947819.1345423; Fri, 11 Apr 2025 20:33: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 1u3L4B-0007wU-Ff; Fri, 11 Apr 2025 20:33:35 +0000 Received: by outflank-mailman (input) for mailman id 947819; Fri, 11 Apr 2025 20:33: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 1u3L49-0007Qw-LR for xen-devel@lists.xenproject.org; Fri, 11 Apr 2025 20:33:33 +0000 Received: from fout-a8-smtp.messagingengine.com (fout-a8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3bad7420-1714-11f0-9eae-5ba50f476ded; Fri, 11 Apr 2025 22:33:32 +0200 (CEST) Received: from phl-compute-11.internal (phl-compute-11.phl.internal [10.202.2.51]) by mailfout.phl.internal (Postfix) with ESMTP id 71D7B1380214; Fri, 11 Apr 2025 16:33:31 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Fri, 11 Apr 2025 16:33:31 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 11 Apr 2025 16:33:30 -0400 (EDT) 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: 3bad7420-1714-11f0-9eae-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1744403611; x=1744490011; bh=lZAID4WC9b z/x+fXcYpHLvBw3VXUpFafmp2WlqFRJQ8=; b=Nr5r5hjkWoiXWErQ2egsygf3sc PWCpdq/e2zmlw2tzETxtsctmiQsc5k7sVG7zlD814+lTczYwF+PkpQbnSg4PFzig PCQVQDcRgi6jj4A5yhWPU+GQgtAF3QeDIhk2Z+eGcM4sbafI0g3wdhpkBntDuq/8 SIgiOozn74RkgtEu8pw3MJvjOZgL1/UU4mpfedw845vjdXqm8G9yUmtn4xNSfpYH 9org7cJhK0I99rUAS4llN8fSR/B8Ex5A33CJg/PI3GqJPjLgzzVjgXQ/3Y1L+ZUQ +ILxRgExdTm+C+VFc+IUCG1AiBzH/LcjjBN8/eC35KKpvsu4zjdIlooweTLQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1744403611; x= 1744490011; bh=lZAID4WC9bz/x+fXcYpHLvBw3VXUpFafmp2WlqFRJQ8=; b=b XCjjiyjoq3YK16rI4AbMPKZ8Ssg6kA720k57ff1POhrhr39wzV5canAIjsRMkYbl s4uSCRrFgzU4+cdyWR+S0QDquWQzZQSTasm/B51HJQ/IGq/kx6mtS/WHK3oMiQ7R 0l6nzUk8IvwKqbkIJslZTjfzdBruZVVDIL+Ra28AjCZnBFEu3fYMaO6bqoDJU5df yXSkb8Sjnhblny/7sYqSD4pQwLYf1+UsRCJRn4unM06azn8mjDtwek5lYg7c/8nO FrLYtzuYvRQFoIyhzzmbKx+rrMS1hYQMvJ32CHi71Yw6kGvJrI7QPqeS7RAyLFJB wSA0zyTVEz1XPAeub8IoQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvuddvjeekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopegrnhgurhgvfidrtghoohhpvghrfeestghithhrihigrdgtohhmpdhrtghpthhtohep mhgrrhhmrghrvghksehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomhdprhgtph htthhopegtrghrughovgestggrrhguohgvrdgtohhmpdhrtghpthhtohepshhsthgrsggv lhhlihhniheskhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , =?utf-8?q?Marek_Marczykowski-?= =?utf-8?q?G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v3 3/7] CI: switch qubes runners to use console.exp Date: Fri, 11 Apr 2025 22:32:15 +0200 Message-ID: <668fb90bbc5e418f6aea85e81d90343d834a066f.1744403499.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 It appears as sometimes it takes more time for Xen even start booting, mostly due to firmware and fetching large boot files by grub. In some jobs the current timeout is pretty close to the actual time needed, and sometimes (rarely for now) test fails due to timeout expiring in the middle of dom0 booting. This will be happening more often if the initramfs will grow (and with more complex tests). This has been observed on some dom0pvh-hvm jobs, at least on runners hw3 and hw11. Switch to using expect (console.exp) for more robust test output handling. This allows waiting separately for Xen starting to boot and then for the test to complete. For now, set both of those to 120s, which pessimistically bumps timeout for the whole test to 240s (from 120s). Add S3 handling to console.exp via SUSPEND_MSG + WAKEUP_CMD. Signed-off-by: Marek Marczykowski-Górecki --- Changes in v3: - split into two patches - generic change is in the previous one Changes in v2: - replace previous "ci: increase timeout for hw tests" with changing how console is interacted with This needs a containers rebuild. --- automation/build/alpine/3.18-arm64v8.dockerfile | 1 +- automation/scripts/console.exp | 13 +++++- automation/scripts/qubes-x86-64.sh | 52 ++++-------------- 3 files changed, 27 insertions(+), 39 deletions(-) diff --git a/automation/build/alpine/3.18-arm64v8.dockerfile b/automation/build/alpine/3.18-arm64v8.dockerfile index 19fe46f8418f..b8482d5bf43f 100644 --- a/automation/build/alpine/3.18-arm64v8.dockerfile +++ b/automation/build/alpine/3.18-arm64v8.dockerfile @@ -48,3 +48,4 @@ RUN apk --no-cache add \ # qubes test deps openssh-client \ fakeroot \ + expect \ diff --git a/automation/scripts/console.exp b/automation/scripts/console.exp index 834a08db1b95..bdb1dd982003 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -9,6 +9,10 @@ # tests that's a command to read serial console # - UBOOT_CMD (optional): command to enter at u-boot prompt # - BOOT_MSG (optional): initial Xen message to wait for (aka sign-of-life) +# - SUSPEND_MSG (optional): message signaling system is going to sleep, it's +# trigger for WAKEUP_CMD (see below) +# - WAKEUP_CMD (optional): command to execute to wakeup the system 30s after +# seeing SUSPEND_MSG # - LOG_MSG (optional): final console message to wait for # - PASSED: message to look for to consider test a success; if LOG_MSG is set, # both LOG_MSG and PASSED must appear (in any order) for test to succeed @@ -45,6 +49,15 @@ if {[info exists env(BOOT_MSG)]} { expect -re "$env(BOOT_MSG)" } +if {[info exists env(WAKEUP_CMD)]} { + expect -re "$env(SUSPEND_MSG)" + + # keep it suspended a bit, then wakeup + sleep 30 + + system "$env(WAKEUP_CMD)" +} + if {[info exists env(LOG_MSG)]} { expect { -re "$env(PASSED)" { diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index a964ac4b7a4e..861e302d845b 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -1,6 +1,6 @@ #!/bin/sh -set -ex +set -ex -o pipefail # One of: # - "" PV dom0, PVH domU @@ -267,52 +267,26 @@ cp -f binaries/xen $TFTP/xen cp -f binaries/bzImage $TFTP/vmlinuz cp -f binaries/dom0-rootfs.cpio.gz $TFTP/initrd-dom0 -# start logging the serial; this gives interactive console, don't close its -# stdin to not close it; the 'cat' is important, plain redirection would hang -# until somebody opens the pipe; opening and closing the pipe is used to close -# the console -mkfifo /tmp/console-stdin -cat /tmp/console-stdin |\ -ssh $CONTROLLER console | tee smoke.serial | sed 's/\r//' & - # start the system pointing at gitlab-ci predefined config ssh $CONTROLLER gitlabci poweron -trap "ssh $CONTROLLER poweroff; : > /tmp/console-stdin" EXIT +trap "ssh $CONTROLLER poweroff" EXIT if [ -n "$wait_and_wakeup" ]; then - # wait for suspend or a timeout - until grep "$wait_and_wakeup" smoke.serial || [ $timeout -le 0 ]; do - sleep 1; - : $((--timeout)) - done - if [ $timeout -le 0 ]; then - echo "ERROR: suspend timeout, aborting" - exit 1 - fi - # keep it suspended a bit, then wakeup - sleep 30 - ssh $CONTROLLER wake + export SUSPEND_MSG="$wait_and_wakeup" + export WAKEUP_CMD="ssh $CONTROLLER wake" fi -set +x -until grep "^Welcome to Alpine Linux" smoke.serial || [ $timeout -le 0 ]; do - sleep 1; - : $((--timeout)) -done -set -x - -tail -n 100 smoke.serial - -if [ $timeout -le 0 ]; then - echo "ERROR: test timeout, aborting" - exit 1 -fi +export PASSED="${passed}" +export BOOT_MSG="Latest ChangeSet: " +export LOG_MSG="\nWelcome to Alpine Linux" +export TEST_CMD="ssh $CONTROLLER console" +export TEST_LOG="smoke.serial" +export TEST_TIMEOUT="$timeout" +./automation/scripts/console.exp | sed 's/\r\+$//' +TEST_RESULT=$? if [ -n "$retrieve_xml" ]; then nc -w 10 "$SUT_ADDR" 8080 > tests-junit.xml X-Patchwork-Id: 14048725 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 67340C369AB for ; Fri, 11 Apr 2025 20:33:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.947820.1345429 (Exim 4.92) (envelope-from ) id 1u3L4B-00082e-UP; Fri, 11 Apr 2025 20:33:35 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 947820.1345429; Fri, 11 Apr 2025 20:33: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 1u3L4B-000809-P7; Fri, 11 Apr 2025 20:33:35 +0000 Received: by outflank-mailman (input) for mailman id 947820; Fri, 11 Apr 2025 20:33:35 +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 1u3L4A-0007cp-W1 for xen-devel@lists.xenproject.org; Fri, 11 Apr 2025 20:33:34 +0000 Received: from fout-a8-smtp.messagingengine.com (fout-a8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3c6b6fc4-1714-11f0-9ffb-bf95429c2676; Fri, 11 Apr 2025 22:33:33 +0200 (CEST) Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.phl.internal (Postfix) with ESMTP id B132E13801B9; Fri, 11 Apr 2025 16:33:32 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Fri, 11 Apr 2025 16:33:32 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 11 Apr 2025 16:33:31 -0400 (EDT) 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: 3c6b6fc4-1714-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1744403612; x=1744490012; bh=VuN3uaPC9/ 1oCBNczeJqoqUgjyO/L96skArqSOsXDoM=; b=POVy4A7s+eBzR+t68xlu1snwRn ij20fd4QPLg6zs1uONXC41GD7eNZtWLz0rCw1/qx4qsJnidQ4VtFIhwjIhoOf+Av 1YmxMXkKrDDkHqXehlOzuGEwAT6UIhdtRa8Th5OZQYUoHuGO/wSxSO+bJQFNr23Y Fg48eHiK7f1BXAx22u+6uA12GCmjRk2KZgmfhQ0KKMs7s4dnjqfu25oOTG171DRF SOogtDFMoWj7OpYPr/VQoUAolIvXiuFbe4qZJ60eYG43t6JE3UbXNjrudDNyqnrv tbeZWEReIIzsMMFy0uV6m0yDEgQoNZ04uTbvrhJ9mckVTz2ilrlVBLu/ojVw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1744403612; x= 1744490012; bh=VuN3uaPC9/1oCBNczeJqoqUgjyO/L96skArqSOsXDoM=; b=d o1kQmZzU72aAV0Ai4batfPWoxikgip4xG/gKzK4Q1K6Kz4XMDl3g8V+pY8R6qzhj EKvnygQm6ZowHStVoNK9mXrPfQPmkPXlmKAflxbQGuqfvjw7Ff3I7NXHXi6Hbu0q k/Mxqke4eXf6t+Uq/yieoR6n0vjI67dmwpCATBE8bOzcOWEX7GFXBC151aHp2Jsu YCIPgo5L2vjxq9Wpbijmyf8n4Cp8uTXP/yHHh8MxSXuD81ZsL3hWVEVvMDHTKj9B eo9NEjiscaYn0f1gQpElsV87clFUrW4q+t3tFKJLnPNJNifCZwAO1fndM4JPdbq1 u1vY/z7dzVPpCF/6csyFQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvuddvjeekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopegrnhgurhgvfidrtghoohhpvghrfeestghithhrihigrdgtohhmpdhrtghpthhtohep mhgrrhhmrghrvghksehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomhdprhgtph htthhopegtrghrughovgestggrrhguohgvrdgtohhmpdhrtghpthhtohepshhsthgrsggv lhhlihhniheskhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , =?utf-8?q?Marek_Marczykowski-?= =?utf-8?q?G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v3 4/7] CI: write whole etc/issue for domU initrd Date: Fri, 11 Apr 2025 22:32:16 +0200 Message-ID: <526ec153b1cabc1d5b111be27ded8d0d4da5178a.1744403499.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Upcoming changes won't unpack original rootfs anymore, so sed on existing file cannot be used. Override the whole file instead. No functional change intended. Signed-off-by: Marek Marczykowski-Górecki --- automation/scripts/qubes-x86-64.sh | 5 ++++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 861e302d845b..dd88a1398f2b 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -182,7 +182,10 @@ ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf - sed -i -e 's/^Welcome/domU \0/' etc/issue + echo "domU Welcome to Alpine Linux 3.18 +Kernel \r on an \m (\l) + +" > etc/issue find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 69caabe2d8ed..4db249530823 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -103,7 +103,10 @@ ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "rc_verbose=yes" >> etc/rc.conf -sed -i -e 's/^Welcome/domU \0/' etc/issue +echo "domU Welcome to Alpine Linux 3.18 +Kernel \r on an \m (\l) + +" > etc/issue copy_domU_files find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz cd .. From patchwork Fri Apr 11 20:32:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 14048731 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 3F015C369B6 for ; Fri, 11 Apr 2025 20:33:51 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.947821.1345448 (Exim 4.92) (envelope-from ) id 1u3L4D-0008Vt-Ai; Fri, 11 Apr 2025 20:33:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 947821.1345448; Fri, 11 Apr 2025 20:33: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 1u3L4D-0008Tt-28; Fri, 11 Apr 2025 20:33:37 +0000 Received: by outflank-mailman (input) for mailman id 947821; Fri, 11 Apr 2025 20:33: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 1u3L4B-0007Qw-Ot for xen-devel@lists.xenproject.org; Fri, 11 Apr 2025 20:33:35 +0000 Received: from fout-a8-smtp.messagingengine.com (fout-a8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3d295e74-1714-11f0-9eae-5ba50f476ded; Fri, 11 Apr 2025 22:33:34 +0200 (CEST) Received: from phl-compute-04.internal (phl-compute-04.phl.internal [10.202.2.44]) by mailfout.phl.internal (Postfix) with ESMTP id F1B8E13801E9; Fri, 11 Apr 2025 16:33:33 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-04.internal (MEProxy); Fri, 11 Apr 2025 16:33:33 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 11 Apr 2025 16:33:32 -0400 (EDT) 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: 3d295e74-1714-11f0-9eae-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1744403613; x=1744490013; bh=NDEEL3vnp9 1rUswoHWj1DPTJJmgLP0WDQTpqGrFuTCo=; b=kDr5k72ygdLZCZkGX7ib57cawd jFCLdCRzjtEby7UUs4vdGQytO6iQQz+mO/k61F/J2XicAPHt7EIn794JVZqr8xX9 zxh3LM0err2uZOgfwZbAEKNnz/u2C/xG6aGDKoEvCXP3LjtgClb+VLGJCIFIIEPI +rfteppAPMpQ3MSHrcr7ZhXVCqliYzIYuGI2d9Ha+oiQe/QYJ/JevRE25O34qRMw Ay7tOPjYViC5SArZHCaN1xYjontoeXGXCuaWZbI/3VgmIk0OFjIqAmunCrKQJNuH 9j0iiQM/YQX6GVLyipfcn5L7TLI7d7NDrJ7E+45Pxgpu2KRxUBET8R4mLNKg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1744403613; x= 1744490013; bh=NDEEL3vnp91rUswoHWj1DPTJJmgLP0WDQTpqGrFuTCo=; b=k TOUJzB6jUQX+DE6z7ysaEoJTXOVXLu6PGb3ZJojqunCUhwdOMOavxGLBSltSlGjH H1XeQXkUwwQoNxZCRs2HZRi1JDTCtjf59/V39+FFZvDUoZRib2DDEwhM1gVLcttf ohA9q6ppMPRXaBvL5z0LegG6aQgIsPNXbvBEPHXnR9sExcLMJD91kzoBmL+XCqSL zDgx07wFwP6r3sj4g9dh6/I6kqcY+jOrTrnba6n6QRsJWoIH6qNv35p4VLWCx2cD mCaqaVfV+LouCkqqWmaL8ERynQUYU7qCMgSJbLlu9EYmxB94bVacWSHpoosiLFhe Yye181zqP0iSHKTHGo9RQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvuddvjeekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopegrnhgurhgvfidrtghoohhpvghrfeestghithhrihigrdgtohhmpdhrtghpthhtohep mhgrrhhmrghrvghksehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomhdprhgtph htthhopegtrghrughovgestggrrhguohgvrdgtohhmpdhrtghpthhtohepshhsthgrsggv lhhlihhniheskhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , =?utf-8?q?Marek_Marczykowski-?= =?utf-8?q?G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v3 5/7] CI: avoid repacking initrd as part of the test job Date: Fri, 11 Apr 2025 22:32:17 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 The prerequisite for this is building rootfs.cpio.gz, not only initrd.tar.gz. That's a change in the test-artifacts repository in the "Rootfs generation" series from Andrew. Having that, do not repack the whole initrd, but only pack modified files and rely on Linux handling of concatenated archives. This allows packing just test-related files (which includes the whole toolstack), instead of the whole initrd. DomU initrd handling is a bit more complicated thing. It's sent to the target host as part of the dom0 initrd. For now include prepared domU initrd as a whole in dom0's rootfs "overlay", which means compressing it (again) each job (this takes 3s). This can be later improved by splitting domU initrd into two parts (base + overlay) and concatenate them in target dom0 already. For this to be useful, test-artifacts would need to provide pre-made double-cpio version too (rootfs.cpio.gz wrapper in yet another cpio.gz as boot/domU-initrd). Since full initrd is not unpacked now when preparing domU (and dom0) rootfs, a couple of minor changes are needed to how they are prepared. This includes creating whole etc/issue file, instead of modifying existing one, and a need to create a couple directories. Finally, move adding "rc_verbose=yes" to /etc/rc.conf to initrd building. Signed-off-by: Marek Marczykowski-Górecki --- Changes in v3: - adjust for Andrew's version of cpio rootfs artifacts - don't require double-cpio archive for domU initrd, instead add it via dom0 initrd as plain cpio to avoid re-compressing the same thing New in v2 Jobs xilinx-* are untested, as I don't have necessary access. --- automation/gitlab-ci/test.yaml | 6 +++-- automation/scripts/qemu-alpine-x86_64.sh | 9 +++----- automation/scripts/qemu-smoke-dom0-arm64.sh | 7 ++---- automation/scripts/qemu-smoke-dom0less-arm64.sh | 7 ++---- automation/scripts/qubes-x86-64.sh | 18 +++++++--------- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 15 ++++++------- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 14 +++++------- 7 files changed, 35 insertions(+), 41 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 59a2de28c864..3e02bf0e4d21 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -11,7 +11,9 @@ - project: xen-project/hardware/test-artifacts job: linux-6.6.86-arm64 ref: master - - alpine-3.18-arm64-rootfs-export + - project: xen-project/hardware/test-artifacts + job: alpine-3.18-arm64-rootfs + ref: master - qemu-system-aarch64-6.0.0-arm64-export .arm32-test-needs: &arm32-test-needs @@ -22,7 +24,7 @@ job: linux-6.6.56-x86_64 ref: master - project: xen-project/hardware/test-artifacts - job: x86_64-rootfs-alpine-3.18 + job: alpine-3.18-x86_64-rootfs ref: master .qemu-arm64: diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 89bdb4df7dac..6e0a67b4018c 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -28,16 +28,15 @@ cd initrd find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz cd .. -# initrd.tar.gz is Dom0 rootfs +# Dom0 rootfs - overlay on top of rootfs.cpio.gz mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz mkdir proc mkdir run mkdir srv mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p root etc/local.d mv ../initrd.cpio.gz ./root cp ../bzImage ./root echo "name=\"test\" @@ -60,9 +59,9 @@ xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf # rebuild Dom0 rootfs -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +cp ../rootfs.cpio.gz ../xen-rootfs.cpio.gz +find . |cpio -H newc -o|gzip >> ../xen-rootfs.cpio.gz cd ../.. cat >> binaries/pxelinux.0 << EOF diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 51d037b0003e..86047ccd9e7b 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -29,13 +29,12 @@ cd .. mkdir -p rootfs cd rootfs -tar xvzf ../initrd.tar.gz mkdir proc mkdir run mkdir srv mkdir sys -rm var/run cp -ar ../dist/install/* . +mkdir -p etc/local.d root mv ../initrd.cpio.gz ./root cp ../Image ./root echo "name=\"test\" @@ -56,8 +55,8 @@ xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . |cpio -H newc -o|gzip > ../xen-rootfs.cpio.gz +cp ../rootfs.cpio.gz ../xen-rootfs.cpio.gz +find . |cpio -H newc -o|gzip >> ../xen-rootfs.cpio.gz cd ../.. # XXX QEMU looks for "efi-virtio.rom" even if it is unneeded diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index f72d20936181..b095a5008e30 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -117,13 +117,12 @@ cd .. # DOM0 rootfs mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz mkdir proc mkdir run mkdir srv mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash @@ -142,8 +141,8 @@ xl network-attach 1 type=vif ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +cp ../binaries/rootfs.cpio.gz ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # ImageBuilder diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index dd88a1398f2b..99c2ece304f0 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -167,13 +167,11 @@ if [ -n "$domU_check" ]; then # DomU mkdir -p rootfs cd rootfs - # fakeroot is needed to preserve device nodes in rootless podman container - fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz mkdir proc mkdir run mkdir srv mkdir sys - rm var/run + mkdir -p etc/local.d echo "#!/bin/sh echo 8 > /proc/sys/kernel/printk @@ -181,26 +179,25 @@ echo 8 > /proc/sys/kernel/printk ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start - echo "rc_verbose=yes" >> etc/rc.conf echo "domU Welcome to Alpine Linux 3.18 Kernel \r on an \m (\l) " > etc/issue - find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz + cp ../binaries/rootfs.cpio.gz ../binaries/domU-rootfs.cpio.gz + find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs fi -# DOM0 rootfs +# DOM0 rootfs - this will be an overlay over alpine's initrd mkdir -p rootfs cd rootfs -fakeroot -s ../fakeroot-save tar xzf ../binaries/initrd.tar.gz mkdir boot mkdir proc mkdir run mkdir srv mkdir sys -rm var/run +mkdir -p etc/local.d cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ @@ -237,7 +234,6 @@ fi chmod +x etc/local.d/xen.start echo "$domU_config" > etc/xen/domU.cfg -echo "rc_verbose=yes" >> etc/rc.conf echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console @@ -245,7 +241,9 @@ cp ../binaries/bzImage boot/vmlinuz if [ -n "$domU_check" ]; then cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU fi -find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +# take base initrd and append test-specific files +cp ../binaries/rootfs.cpio.gz ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 4db249530823..52a0e05e3f1b 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -80,6 +80,7 @@ argo-exec -l -p 28333 -- /bin/echo " copy_dom0_files () { + mkdir -p root usr/local/lib cp "${WORKDIR}/binaries/xen-argo.ko" "root/" cp -ar "${WORKDIR}/binaries/lib/"* "usr/local/lib/" cp "${WORKDIR}/binaries/argo-exec" "usr/local/bin/" @@ -92,9 +93,8 @@ fi # Set up domU rootfs. mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz mkdir proc run srv sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh set -x export LD_LIBRARY_PATH=/usr/local/lib @@ -102,23 +102,22 @@ PATH=/usr/local/bin:/usr/local/sbin:\$PATH ${DOMU_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf echo "domU Welcome to Alpine Linux 3.18 Kernel \r on an \m (\l) " > etc/issue copy_domU_files -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +cp ../binaries/initrd.cpio.gz ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs # Set up dom0 rootfs. mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz mkdir boot proc run srv sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash set -x export LD_LIBRARY_PATH=/usr/local/lib @@ -127,14 +126,14 @@ ${DOM0_CMD} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start echo "${DOMU_CFG}${DOMU_CFG_EXTRA}" > etc/xen/domU.cfg -echo "rc_verbose=yes" >> etc/rc.conf echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU copy_dom0_files -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +cp ../binaries/rootfs.cpio.gz ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. # Load software into TFTP server directory. diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 3e1fcf6bf93c..97190d0cbb9c 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -41,33 +41,31 @@ fi # DomU mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz mkdir proc mkdir run mkdir srv mkdir sys -rm var/run +mkdir -p etc/local.d echo "#!/bin/sh ${domU_check} /bin/sh" > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz +cp ../binaries/rootfs.cpio.gz ../binaries/domU-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/domU-rootfs.cpio.gz cd .. rm -rf rootfs # DOM0 rootfs mkdir -p rootfs cd rootfs -tar xzf ../binaries/initrd.tar.gz mkdir proc mkdir run mkdir srv mkdir sys -rm var/run cp -ar ../binaries/dist/install/* . +mkdir -p etc/local.d echo "#!/bin/bash export LD_LIBRARY_PATH=/usr/local/lib @@ -78,8 +76,8 @@ bash /etc/init.d/xencommons start ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start -echo "rc_verbose=yes" >> etc/rc.conf -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +cp ../binaries/rootfs.cpio.gz ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. From patchwork Fri Apr 11 20:32:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 14048726 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 E29FAC369B1 for ; Fri, 11 Apr 2025 20:33:48 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.947822.1345459 (Exim 4.92) (envelope-from ) id 1u3L4G-0000Wo-SF; Fri, 11 Apr 2025 20:33:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 947822.1345459; Fri, 11 Apr 2025 20:33: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 1u3L4G-0000Wg-Nz; Fri, 11 Apr 2025 20:33:40 +0000 Received: by outflank-mailman (input) for mailman id 947822; Fri, 11 Apr 2025 20:33: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 1u3L4F-0007cp-72 for xen-devel@lists.xenproject.org; Fri, 11 Apr 2025 20:33:39 +0000 Received: from fout-a8-smtp.messagingengine.com (fout-a8-smtp.messagingengine.com [103.168.172.151]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3ee5cbc3-1714-11f0-9ffb-bf95429c2676; Fri, 11 Apr 2025 22:33:37 +0200 (CEST) Received: from phl-compute-02.internal (phl-compute-02.phl.internal [10.202.2.42]) by mailfout.phl.internal (Postfix) with ESMTP id D7A38138021C; Fri, 11 Apr 2025 16:33:36 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Fri, 11 Apr 2025 16:33:36 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 11 Apr 2025 16:33:35 -0400 (EDT) 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: 3ee5cbc3-1714-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1744403616; x=1744490016; bh=YUNGCrguCt aKfdk0ykLhED3S58oNoWyLOaKPEveJ8o0=; b=H7gZIBnMiR5sM1nUYeFoJnOMVC yL4YXMTZoWaTXoKAJQNmnei8zOOJyl8YafMOOvcvTgilhNfeoKb4Ke5ezhm9KfsV ZIgMc02qoYJor0qT81RDXNKvbM3fWqHqo5loHyAopPZmRSTLc8KKtrFDyaBnnJBE HwiCMBWld424/7QM2GuMQX6fhN1ZFcNpMHfmfFVGCQuBckEaewSEbJe/GlQMw8Bc XaazjIdpouY5YFfmYqE+EY6dsbBcStDL237ElqHMqKxQenSoOC3ZlhXYZKNlkudr WlyeqmqL4psiB2ld3QQcjyUovbIZhz98Vl6yzut12+2KboxrgquJhYO7TLww== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1744403616; x= 1744490016; bh=YUNGCrguCtaKfdk0ykLhED3S58oNoWyLOaKPEveJ8o0=; b=m 2BEqRh4HomZTX9T0ahPkRqAIsy7aIxJAxAAttQOf4vaWSITrAFQsqrNl4evgK5Ml F1wQlT94lG+VaDMfg6cjRXzbYwpzeEeIZZGnQXn915z7YbofniFKOaF+MbY4Ol3T R2RKWx1OhnAeWRG+jPj1ToqPkfKPKu6X32XLLveH9Kqt9GvRYb/13PFwdkD1dS9O VMUW2qIGxL+0uKvk9gar1HcPFw8Ib9Xv+LCIxP8+bDPP8M48dF6cIHeYxQ/cUO5f R1zBvC6nR29Cppu15/e+0VZBAY8ZSX3c7w1QSA9KKo/ZswoJ3TjDZhw3rb+0smfS auOQHvRsLkVrTFVPivPaw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvuddvjeelucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeehpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopegrnhgurhgvfidrtghoohhpvghrfeestghithhrihigrdgtohhmpdhrtghpthhtohep mhgrrhhmrghrvghksehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomhdprhgtph htthhopegtrghrughovgestggrrhguohgvrdgtohhmpdhrtghpthhtohepshhsthgrsggv lhhlihhniheskhgvrhhnvghlrdhorhhg X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , =?utf-8?q?Marek_Marczykowski-?= =?utf-8?q?G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v3 7/7] CI: save toolstack artifact as cpio.gz Date: Fri, 11 Apr 2025 22:32:19 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 This avoids the need to re-compress it in every test job. Signed-off-by: Marek Marczykowski-Górecki --- New in v2 --- automation/scripts/build | 2 +- automation/scripts/qemu-alpine-x86_64.sh | 2 +- automation/scripts/qemu-smoke-dom0-arm64.sh | 2 +- automation/scripts/qemu-smoke-dom0less-arm64.sh | 2 +- automation/scripts/qubes-x86-64.sh | 4 +++- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/automation/scripts/build b/automation/scripts/build index 522efe774ef3..365534895047 100755 --- a/automation/scripts/build +++ b/automation/scripts/build @@ -108,7 +108,7 @@ else # Note: Some smoke tests depending on finding binaries/xen on a full build # even though dist/ contains everything, while some containers don't even # build Xen - cp -r dist binaries/ + (cd dist/install; find | cpio -o -H newc | gzip) > binaries/toolstack.cpio.gz cp -r tools/tests binaries/ collect_xen_artefacts fi diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 6e0a67b4018c..746fd48e6a0e 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -35,7 +35,6 @@ mkdir proc mkdir run mkdir srv mkdir sys -cp -ar ../dist/install/* . mkdir -p root etc/local.d mv ../initrd.cpio.gz ./root cp ../bzImage ./root @@ -61,6 +60,7 @@ xl -vvv create -c /root/test.cfg chmod +x etc/local.d/xen.start # rebuild Dom0 rootfs cp ../rootfs.cpio.gz ../xen-rootfs.cpio.gz +cat ../toolstack.cpio.gz >> ../xen-rootfs.cpio.gz find . |cpio -H newc -o|gzip >> ../xen-rootfs.cpio.gz cd ../.. diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 86047ccd9e7b..a3f321b253e2 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -33,7 +33,6 @@ mkdir proc mkdir run mkdir srv mkdir sys -cp -ar ../dist/install/* . mkdir -p etc/local.d root mv ../initrd.cpio.gz ./root cp ../Image ./root @@ -56,6 +55,7 @@ xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start cp ../rootfs.cpio.gz ../xen-rootfs.cpio.gz +cat ../toolstack.cpio.gz >> ../xen-rootfs.cpio.gz find . |cpio -H newc -o|gzip >> ../xen-rootfs.cpio.gz cd ../.. diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh b/automation/scripts/qemu-smoke-dom0less-arm64.sh index b095a5008e30..a73cb24b7e52 100755 --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh @@ -121,7 +121,6 @@ mkdir proc mkdir run mkdir srv mkdir sys -cp -ar ../binaries/dist/install/* . mkdir -p etc/local.d echo "#!/bin/bash @@ -142,6 +141,7 @@ ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start cp ../binaries/rootfs.cpio.gz ../binaries/dom0-rootfs.cpio.gz +cat ../binaries/toolstack.cpio.gz >> ../binaries/dom0-rootfs.cpio.gz find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 99c2ece304f0..a9696d2168c3 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -198,7 +198,6 @@ mkdir run mkdir srv mkdir sys mkdir -p etc/local.d -cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ @@ -232,8 +231,10 @@ else fi chmod +x etc/local.d/xen.start +mkdir -p etc/xen echo "$domU_config" > etc/xen/domU.cfg +mkdir -p etc/default echo "XENCONSOLED_TRACE=all" >> etc/default/xencommons echo "QEMU_XEN=/bin/false" >> etc/default/xencommons mkdir -p var/log/xen/console @@ -243,6 +244,7 @@ if [ -n "$domU_check" ]; then fi # take base initrd and append test-specific files cp ../binaries/rootfs.cpio.gz ../binaries/dom0-rootfs.cpio.gz +cat ../binaries/toolstack.cpio.gz >> ../binaries/dom0-rootfs.cpio.gz find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 52a0e05e3f1b..40f23f29582e 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -116,8 +116,7 @@ rm -rf rootfs mkdir -p rootfs cd rootfs mkdir boot proc run srv sys -cp -ar ../binaries/dist/install/* . -mkdir -p etc/local.d +mkdir -p etc/local.d etc/xen etc/default echo "#!/bin/bash set -x export LD_LIBRARY_PATH=/usr/local/lib @@ -133,6 +132,7 @@ cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU copy_dom0_files cp ../binaries/rootfs.cpio.gz ../binaries/dom0-rootfs.cpio.gz +cat ../binaries/toolstack.cpio.gz >> ../binaries/dom0-rootfs.cpio.gz find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh b/automation/scripts/xilinx-smoke-dom0less-arm64.sh index 97190d0cbb9c..ab9205f29689 100755 --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh @@ -63,7 +63,6 @@ mkdir proc mkdir run mkdir srv mkdir sys -cp -ar ../binaries/dist/install/* . mkdir -p etc/local.d echo "#!/bin/bash @@ -77,6 +76,7 @@ ${dom0_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start cp ../binaries/rootfs.cpio.gz ../binaries/dom0-rootfs.cpio.gz +cat ../binaries/toolstack.cpio.gz >> ../binaries/dom0-rootfs.cpio.gz find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. From patchwork Fri Apr 11 20:32:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= X-Patchwork-Id: 14048727 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 9F7C8C369B4 for ; Fri, 11 Apr 2025 20:33:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.947825.1345469 (Exim 4.92) (envelope-from ) id 1u3L4I-0000mt-5w; Fri, 11 Apr 2025 20:33:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 947825.1345469; Fri, 11 Apr 2025 20:33:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u3L4I-0000m7-0Z; Fri, 11 Apr 2025 20:33:42 +0000 Received: by outflank-mailman (input) for mailman id 947825; Fri, 11 Apr 2025 20:33:41 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u3L4H-0007Qw-54 for xen-devel@lists.xenproject.org; Fri, 11 Apr 2025 20:33:41 +0000 Received: from fhigh-a3-smtp.messagingengine.com (fhigh-a3-smtp.messagingengine.com [103.168.172.154]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 40332cdc-1714-11f0-9eae-5ba50f476ded; Fri, 11 Apr 2025 22:33:39 +0200 (CEST) Received: from phl-compute-03.internal (phl-compute-03.phl.internal [10.202.2.43]) by mailfhigh.phl.internal (Postfix) with ESMTP id 09AAF1140174; Fri, 11 Apr 2025 16:33:39 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-03.internal (MEProxy); Fri, 11 Apr 2025 16:33:39 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 11 Apr 2025 16:33:37 -0400 (EDT) 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: 40332cdc-1714-11f0-9eae-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= invisiblethingslab.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to; s=fm2; t=1744403619; x=1744490019; bh=O7uX55ccR6 xGebFg3kRT0d2q6xGT5L2tU3KLCLv0anQ=; b=cQEJQzb3kbjuie54zfZlH5Ie7F FKXpp6x3zCkZmMgsb7wITuQjJF2w0ydVItdjUs6LHHVbbR6Z6NgiLTPqUkKuCI/G LJOvuZV/iQRdIRRLPHj6J3BEYTN73A9ipamSEA388Hx8aJE1b3ox4oH+Kn1qDea1 Ahd/CZFOV2U+kCmZkzBQcdmnfucW+IXMe1SvDGp9hS/TOsJnJAuybi6OAUXqHcGB 6a7UWonucr6R9NYFB2goHg16O5iLFBXYpamN8dgNZ9GApn1q27QFRTrmtwXxMN66 DByEwIUPbNxo9gDZxKzo4JGY90D1UzLxod6Uth3gjny31mPXFt4OTjZypcBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1744403619; x= 1744490019; bh=O7uX55ccR6xGebFg3kRT0d2q6xGT5L2tU3KLCLv0anQ=; b=J L6hwZjYnoJCqLj/gK5ic24i/dHlnCb95yDQggUSJvZhF+gJpSv1FxAN0dw6xLcac TrL+pLcp1pPgch5DhYDJDed+JnrOH7uxh0k42eMlt0U+jBEbFU/ZhDVtuFivp8Oi e5aYFWHazfIXERSwmt8dgQgQfhIydzP5aSluo3ZxBxnkp5DfLA5gfe5NpkvibSQo J8Ca6rUg7ye+ysnry2Em2iMcIg6nj1B2pC0j2jlPHjwcw96Wd2rykzcRA8dhwXZw y/BljCgpRCznBejHC8Y/r/lLtHf9pPvOU8+C9g5V7kmSaRV+g718bRQ6IgfhtkxP zKoEb6EZeOQ6EWiBulEPA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvuddvjeekucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeelpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopegrnhgurhgvfidrtghoohhpvghrfeestghithhrihigrdgtohhmpdhrtghpthhtohep mhgrrhhmrghrvghksehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomhdprhgtph htthhopegrnhhthhhonhihrdhpvghrrghrugesvhgrthgvshdrthgvtghhpdhrtghpthht ohepmhhitghhrghlrdhorhiivghlsegrmhgurdgtohhmpdhrtghpthhtohepjhgsvghulh hitghhsehsuhhsvgdrtghomhdprhgtphhtthhopehjuhhlihgvnhesgigvnhdrohhrghdp rhgtphhtthhopehrohhgvghrrdhprghusegtihhtrhhigidrtghomhdprhgtphhtthhope hsshhtrggsvghllhhinhhisehkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , =?utf-8?q?Marek_Marczykowski-?= =?utf-8?q?G=C3=B3recki?= , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Stefano Stabellini Subject: [PATCH test-artifacts v3 8/7] Enable CONFIG_USB_RTL8152 in kernel for hw12 runner Date: Fri, 11 Apr 2025 22:32:20 +0200 Message-ID: <20250411203336.585215-1-marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 It uses this USB network interface. Signed-off-by: Marek Marczykowski-Górecki --- scripts/build-linux.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build-linux.sh b/scripts/build-linux.sh index 49b5ebe..af684d6 100755 --- a/scripts/build-linux.sh +++ b/scripts/build-linux.sh @@ -32,6 +32,7 @@ case $UNAME in | grep 'XEN' \ | grep '=m' \ | sed 's/=m/=y/g' >> .config + ./scripts/config --enable USB_RTL8152 ;; aarch64)