From patchwork Mon Apr 7 12:31:01 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: 14040370 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 1C42EC36010 for ; Mon, 7 Apr 2025 12:34:47 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939834.1339800 (Exim 4.92) (envelope-from ) id 1u1lgT-0006Dt-0e; Mon, 07 Apr 2025 12:34:37 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939834.1339800; Mon, 07 Apr 2025 12:34: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 1u1lgS-0006DZ-RL; Mon, 07 Apr 2025 12:34:36 +0000 Received: by outflank-mailman (input) for mailman id 939834; Mon, 07 Apr 2025 12:34: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 1u1lgR-0006Bg-P0 for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:35 +0000 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id a901fac5-13ac-11f0-9eaa-5ba50f476ded; Mon, 07 Apr 2025 14:34:34 +0200 (CEST) Received: from phl-compute-01.internal (phl-compute-01.phl.internal [10.202.2.41]) by mailfhigh.phl.internal (Postfix) with ESMTP id BC3C8114021E; Mon, 7 Apr 2025 08:34:33 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-01.internal (MEProxy); Mon, 07 Apr 2025 08:34:33 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34: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: a901fac5-13ac-11f0-9eaa-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=1744029273; x=1744115673; bh=+wUYsjtUJc 5L9TuaQNNpMAeWAX2i+xchkoztHrK6MYY=; b=lWRgvKlNUc5fC8p1j2EqJMioOq 557asKPjMRf6woeRU5dYUzQXGhUJlgZHdFBwZaks1spVsQsSIO31qVuWwlSRft1N 4fF5g0fCA5g2BH6gwmzvwUIN6H3af8TEYn/OsWKJgIZnfsDGQ0B7R5F+N4tNSL7R FCYfcz33fdUNL4EPuSzYDzbxDxcjzPuDObQWEazNe7Ysk0yWAxnE8FtDiMdmcjsd JCwcQgmJFpE05Sm+pLnHU7tJ/G6NWCg+o0m98sEGpyGIP1vpmWZ/zc02H7OGNilU ETd+HXTrIzPJa2oNdsslRmnkzVexsJMeM463M/H3JOaE9ftNgixY4GUsg82w== 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=1744029273; x= 1744115673; bh=+wUYsjtUJc5L9TuaQNNpMAeWAX2i+xchkoztHrK6MYY=; b=d MZUZqIxH5rVFbors4D4p2cUljYYxfWMV/o1PnDinl0eszsg6Z7uhFoAS+x9Wa0fi UDIhpumbQBPBa/ix1CXLV63zm6hK4LYVBRYd9q6CWXGVtKIEZkXVEaI1Vyzt8KaN W2wboIY5oqvjeAGrXMgzXqntI2ecIo1SZlTQbsEwZhda5o5VwOtyvKcW++xw5EQ3 T512dmLV5jqa69Ost32t+dym7vKkb+sxKtWxgvErTOtUlO6tJoV1UW4JE2pbjYKc hrajpNJ8K9M1Z1R0PhKTXE9rcmE9EKwj3DPSBBk5+tLfdQh83PND+GJFAnLm8evK 1NU3cAwAvf3zAYNt+nGMg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtohepshhsthgrsggvlhhlihhniheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoh eptggrrhguohgvsegtrghrughovgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Stefano Stabellini , Doug Goldstein Subject: [PATCH v2 01/12] CI: prevent grub unpacking initramfs Date: Mon, 7 Apr 2025 14:31:01 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 It fails on larger initramfs (~250MB one) and sometimes even smaller depending on memory size/memory map, let Linux do it. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index f27296445901..8e78b7984e98 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -248,7 +248,7 @@ CONTROLLER=control@thor.testnet echo " 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 +module2 --nounzip (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg echo "#!ipxe From patchwork Mon Apr 7 12:31:02 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: 14040375 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 35999C3601E for ; Mon, 7 Apr 2025 12:34:50 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939835.1339816 (Exim 4.92) (envelope-from ) id 1u1lgU-0006eR-5M; Mon, 07 Apr 2025 12:34:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939835.1339816; Mon, 07 Apr 2025 12:34:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u1lgU-0006dJ-1b; Mon, 07 Apr 2025 12:34:38 +0000 Received: by outflank-mailman (input) for mailman id 939835; Mon, 07 Apr 2025 12:34: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 1u1lgS-0006Bg-PH for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:36 +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 a9ca7a15-13ac-11f0-9eaa-5ba50f476ded; Mon, 07 Apr 2025 14:34:35 +0200 (CEST) Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.phl.internal (Postfix) with ESMTP id 15A0E1380319; Mon, 7 Apr 2025 08:34:35 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Mon, 07 Apr 2025 08:34:35 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34:33 -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: a9ca7a15-13ac-11f0-9eaa-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=1744029275; x=1744115675; bh=+20xCEO7XU Y0EaVPTnWYODVDi1jG/CkQA6sU2Q2/xLY=; b=FymF1YgbTKW61bNzVVxaQnYkEK n/fSN+4JUSe1VkjvITxqbLU7kHOTiYcYEYBWoj6+UrU14E04vPsd9A7vsqVopBbM bvclcFrtS+K5CgOeI2qgw2P5SbQ2izDjM9RX8u47W/4cY1XwCTENlZDn54MutXmW nOWPsxt1u37o+4qPuET6YQHEnQq9JF7RQ/nB1BOCwJactys48gnwdQ9vHM7BetKv H2LkKDLSITajTzbmDQDxwliVdiD/EjRtJJE/ruW+ddhXHL98thUnk0RVYAstjqao zrW4eWX2OihHgTeVY5zxL64chqkg1slZKcT+nGTkkVAZQkPt0yeioBdA3Z0Q== 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=1744029275; x= 1744115675; bh=+20xCEO7XUY0EaVPTnWYODVDi1jG/CkQA6sU2Q2/xLY=; b=T KEtl3cmhp3xqKubJjsrt4rTApBH+VuZfMY7KH1wx4emi+G/Iejf+9emT1QB8ZupM TAl9lK7KlUXLMHfQtbVjtCKqy09uaMbC71VEtxry2U13mxM83utwbC119Cos0R07 J3nS/AzfBVSUSnjtv/jc+CxeqHeoprg4SUde4Kvg+6U74ujueyVMqak+m6wSIhPb urygUaVDrlZHw/1Iet6k+VshYaeoG5wifjzeI+X3RANwwrh8llv+fi7RQaImivU5 QDV+ueANpBIO4LRIpWW9hTFuVAt2aqorSPaDzgddBVGyRqM9hbrOL3iO/zytqHRS GBvrA3VXPMOVzNYTsApMQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtoheptggrrhguohgvsegtrghrughovgdrtghomhdprhgtphhtthhopehsshhtrg gsvghllhhinhhisehkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 02/12] CI: switch qubes runners to use console.exp Date: Mon, 7 Apr 2025 14:31:02 +0200 Message-ID: <33fe66669f6ca9fb7573d69d9f9fefeb653fe503.1744028549.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). Some messages use regex, use 'expect -re' for all of them for consistency, even though not all strictly need that (yet). Signed-off-by: Marek Marczykowski-Górecki --- 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 | 23 ++++++-- automation/scripts/qubes-x86-64.sh | 52 ++++-------------- 3 files changed, 32 insertions(+), 44 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 31ce97b91b63..d1689fa5bf7f 100755 --- a/automation/scripts/console.exp +++ b/automation/scripts/console.exp @@ -28,21 +28,34 @@ 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(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 { - "$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/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 8e78b7984e98..0eac410f4168 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 @@ -263,52 +263,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: 14040371 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 E09A9C369A2 for ; Mon, 7 Apr 2025 12:34:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939837.1339832 (Exim 4.92) (envelope-from ) id 1u1lgX-0006xZ-2U; Mon, 07 Apr 2025 12:34:41 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939837.1339832; Mon, 07 Apr 2025 12:34:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u1lgW-0006w0-NO; Mon, 07 Apr 2025 12:34:40 +0000 Received: by outflank-mailman (input) for mailman id 939837; Mon, 07 Apr 2025 12:34:40 +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 1u1lgW-0006u9-03 for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:40 +0000 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id aa96952e-13ac-11f0-9ffb-bf95429c2676; Mon, 07 Apr 2025 14:34:37 +0200 (CEST) Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.phl.internal (Postfix) with ESMTP id 5F731114016D; Mon, 7 Apr 2025 08:34:36 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Mon, 07 Apr 2025 08:34:36 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34: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: aa96952e-13ac-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=1744029276; x=1744115676; bh=oUzAo8IKhM cypBS9tzrQd/MdWccuAy4m3Q9jZgmqj4k=; b=Qj5q/13Fgj5Aono7HNX6PRJbEf hTweD2CbsxHB5a4t6RVDNrdnsnvL9qYQ0+HRtDBqUBP58tbFtk3k+y3V6La2FJic GdGoBsQT6RtRA0ZFt5WVI2xt8edBQHYYUByU+aPo14f8lWFaNg3ZY7RcE3iWFYtn U3l3qhLme0cKd5RbepbA0IPKLrX+bGZ8GSR+JPw0jN+w6XnSGGirRG4K5UWNZ7Gh cUXG8Rn3F7W8FEFFM0PpXvqaqg+ErDbVich3xWCAtkKQ2s20L4cZztmw9S6FTQ/b o3jg6pW8JU69+U6SKl3ewGXQ9LazYG5Q7/WMmxwS0aHI0C/Nb76rPUpVBo0Q== 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=1744029276; x= 1744115676; bh=oUzAo8IKhMcypBS9tzrQd/MdWccuAy4m3Q9jZgmqj4k=; b=W dNFDrzT87NMqkaD6glQO9gujVR3+bAwtw9rXLW+MWJ+dwJtKDgjpj2UyYQtoPDLk FFGCHHcfX5u69IItIKMdglTIOphgN3L4d0nzTglWbZmXiuIUBb9zDu7r7QbusWl1 OXhUHD67siwaWl40z02MkkhKAum8qHlRUXzzKwXe74dFnhr+v0mSJgZmaJRPqmKY 1nTylKhaiUouN/SRlZL5FKRBECvj3UsXc/N+jqh75VZAgToUEOX8+Rdhl5pl+Ggj z4XamcNul09mAE0WPhJA66pIxrbHnapPlCcE3wPBkzfxIMCKIPw3z+IGY3f7RiGZ aCLulCYPOph4tLCVXfdmQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtohepshhsthgrsggvlhhlihhniheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoh eptggrrhguohgvsegtrghrughovgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Stefano Stabellini , Doug Goldstein Subject: [PATCH v2 03/12] CI: enable XHCI console in Xen debug build on Alpine Date: Mon, 7 Apr 2025 14:31:03 +0200 Message-ID: <318a25de10a4ec992d5e42b1f920354b720988ba.1744028549.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 This build is used for hardware tests, and some runners use XHCI console Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- automation/gitlab-ci/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index 2513908b059b..169bebe3c775 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -341,6 +341,7 @@ alpine-3.18-gcc-debug: CONFIG_ARGO=y CONFIG_UBSAN=y CONFIG_UBSAN_FATAL=y + CONFIG_XHCI=y debian-12-x86_64-gcc-debug: extends: .gcc-x86-64-build-debug From patchwork Mon Apr 7 12:31:04 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: 14040373 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 D25A8C369A3 for ; Mon, 7 Apr 2025 12:34:50 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939836.1339826 (Exim 4.92) (envelope-from ) id 1u1lgW-0006v0-Jt; Mon, 07 Apr 2025 12:34:40 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939836.1339826; Mon, 07 Apr 2025 12:34: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 1u1lgW-0006ut-EU; Mon, 07 Apr 2025 12:34:40 +0000 Received: by outflank-mailman (input) for mailman id 939836; Mon, 07 Apr 2025 12:34:39 +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 1u1lgV-0006Bg-2a for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:39 +0000 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id ab61bf5f-13ac-11f0-9eaa-5ba50f476ded; Mon, 07 Apr 2025 14:34:38 +0200 (CEST) Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.phl.internal (Postfix) with ESMTP id AEE6D114021B; Mon, 7 Apr 2025 08:34:37 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Mon, 07 Apr 2025 08:34:37 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34:36 -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: ab61bf5f-13ac-11f0-9eaa-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=1744029277; x=1744115677; bh=OfkNWEVYOp WJZ9YipFU35kXAq9pfOLZms5AaVuP4WDg=; b=fXGiw2aF4T5C41zGLwCWJr9qfC ZBjZdKzFUWS7hzGtqAKGW3P5z5eyflQQ5/24OSbD0CNIB4Kf79K1LzbbNt8KlfKY 4UT9X8MnJ76Yiq+ArnSQDTXnPgLuYzRwjwo9wnbzoXd7iDSgTIXs7P5V3IYcjUsO XoO4GRDOznkqgwshygjZtmavKNZIPUUZlVCb7T0V9lfa6APuYErC5s9+8BYS9eHZ Sc/EMh6LQntyDmmCrNU0HD8UItRaqTXliXIgggb94HbeE8iEuCg7UFazA8wi9Imo uxSFeoCw/6d6dXhkl8NR9DwgsUxFXQ6JuBqRSZxG6vORPqCkhRIdGEEchIAg== 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=1744029277; x= 1744115677; bh=OfkNWEVYOpWJZ9YipFU35kXAq9pfOLZms5AaVuP4WDg=; b=J JOMH3zwX+M2BME00opla99KsXd5gwojM3gp2+nLX2QwyGWlIA1tm2KK6B3DRKgh9 0nQyFo9GfTXl8ddJ8zXzN3SNC/a3RspeV6tQVSKqmj312zuNRCKPKn4RnXd0rL0X q4x7XD+b3W5r2QK1LRwTHayf6ZOdVn3+iDIA/oT64Fnh4cS3nEkQMLj9vDL+YF0m q6mFCzfYCg57IyYEnJYF3uzekz38eSRzz05wF7pqQPuwAPQM84g279m/YB66+/8g ShiJ7H1yXz8aGrAdTASdr7FYzBSq97gKYU4ehKvcqdofHymAkdyBdedeJa5CC4Kr A/Z/Hh77XzdNbArt6+z5A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtohepshhsthgrsggvlhhlihhniheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoh eptggrrhguohgvsegtrghrughovgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Stefano Stabellini , Doug Goldstein Subject: [PATCH v2 04/12] CI: include domU kernel messages in the console output log Date: Mon, 7 Apr 2025 14:31:04 +0200 Message-ID: <256c0e93b0500454815f28a370dd208261fa17b6.1744028549.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 0eac410f4168..7bf42d2e3d31 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -175,6 +175,8 @@ if [ -n "$domU_check" ]; then rm var/run echo "#!/bin/sh +echo 8 > /proc/sys/kernel/printk + ${domU_check} " > etc/local.d/xen.start chmod +x etc/local.d/xen.start From patchwork Mon Apr 7 12:31:05 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: 14040374 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 72A74C369A4 for ; Mon, 7 Apr 2025 12:34:51 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939839.1339846 (Exim 4.92) (envelope-from ) id 1u1lgY-0007Nj-A1; Mon, 07 Apr 2025 12:34:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939839.1339846; Mon, 07 Apr 2025 12:34: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 1u1lgY-0007Lu-3p; Mon, 07 Apr 2025 12:34:42 +0000 Received: by outflank-mailman (input) for mailman id 939839; Mon, 07 Apr 2025 12:34:40 +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 1u1lgW-0006Bg-J6 for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:40 +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 ac2a63e2-13ac-11f0-9eaa-5ba50f476ded; Mon, 07 Apr 2025 14:34:39 +0200 (CEST) Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id 11CAE138022F; Mon, 7 Apr 2025 08:34:39 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Mon, 07 Apr 2025 08:34:39 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34: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: ac2a63e2-13ac-11f0-9eaa-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=1744029279; x=1744115679; bh=c4BIOHpfm5 N25C8N14eGKLLGzXXxmXcsg7/1yxitfro=; b=Z2jtKVmM9/pxC7PxIFKGQqHXPK deoMJIFSi3Nlshndr4guwwlDPu8I5AYWL8gMKJulK0A3B6/IwitSpbDjm8+RRTp8 8S4V7CQ6fL4dppug1ICFNPMTHMqQqHWJD7dxFtqZVRvLSOe47OghBABcl/XStUhY XUtnY/O3OucrGKU7pumRLfoggbaYJbfKYp/LAMtcwxTN8EFucvRiISbyLtvWBown a6ILw6kvj0U8UzmLcZM5BkR4Sv3FBGpSGVheiTeCNhyrbtIUoNXRxy7uc303jAqk VE/Mkhx/8xTDVSjEE0LDBDPCbeafsH9tvp8jVwaA2+HRQRWAQpMfbfxsW4kQ== 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=1744029279; x= 1744115679; bh=c4BIOHpfm5N25C8N14eGKLLGzXXxmXcsg7/1yxitfro=; b=F GUKvJUXJAnAShjgtxuNOPc2qfQGK672ruDdACyrsacAlj4Rl5fZpg11uVRR43LRc cfVXK8pcrqYkPz4lAsyuZKxxSNXQbDE/Q/BVkJteuDUTSkB5V5w8ouZCyULHj/5s cvjmp+345I2Hxs55vfD43dJh/htR7Z9RS3Jim//bocWUfY8GPSvJXg3sxuyQHjQe Bb8H6l8/N8oHoEeStWU4/toVrY07xs7yNJW5+SPZSklbHg5ihcpdqQ9JowVZ8DdU fuEvjqH8mPcrfEQmhKHP9vE+SSzSrWZurCTGpdkv/c8Qc7qi1PtYasJze26aVvkZ ay3bL+6SPhqIheAlNXovQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvdduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtoheptggrrhguohgvsegtrghrughovgdrtghomhdprhgtphhtthhopehsshhtrg gsvghllhhinhhisehkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 05/12] CI: increase verbosity of starting a domain Date: Mon, 7 Apr 2025 14:31:05 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 And start collecting qemu log earlier, so it isn't lost in case of a timeout during domain startup. Signed-off-by: Marek Marczykowski-Górecki --- Changes in v2: - adjust xilinx-smoke-dom0-x86_64.sh too --- 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/qubes-x86-64.sh | 4 ++-- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 1ff689b577e3..17e2141d625e 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -56,7 +56,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh b/automation/scripts/qemu-smoke-dom0-arm32.sh index e1cd83880928..0c60a66e25e3 100755 --- a/automation/scripts/qemu-smoke-dom0-arm32.sh +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh @@ -21,7 +21,7 @@ echo "#!/bin/bash xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > ./root/xen.start echo "bash /root/xen.start" >> ./etc/init.d/xen-watchdog diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh b/automation/scripts/qemu-smoke-dom0-arm64.sh index 4d22a124df11..8774a8701232 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -52,7 +52,7 @@ bash /etc/init.d/xencommons start xl list -xl create -c /root/test.cfg +xl -vvv create -c /root/test.cfg " > etc/local.d/xen.start chmod +x etc/local.d/xen.start diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 7bf42d2e3d31..17fcbd8fa7db 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -122,7 +122,6 @@ echo \"${passed}\" " dom0_check=" -tail -F /var/log/xen/qemu-dm-domU.log & until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU.log; do sleep 1 done @@ -222,7 +221,8 @@ if [ -n "$domU_check" ]; then echo " # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & +xl -vvv create /etc/xen/domU.cfg ${dom0_check} " >> etc/local.d/xen.start else diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index f70cfdc1552a..7834ffbe0593 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -49,7 +49,7 @@ ifconfig xenbr0 up ifconfig xenbr0 192.168.0.1 # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & -xl create /etc/xen/domU.cfg +xl -vvv create /etc/xen/domU.cfg set +x until grep -q \"${DOMU_MSG}\" /var/log/xen/console/guest-domU.log; do sleep 1 @@ -75,7 +75,7 @@ done | argo-exec -p 28333 -d 0 -- /bin/echo " DOM0_CMD=" insmod /root/xen-argo.ko -xl create /etc/xen/domU.cfg +xl -vvv create /etc/xen/domU.cfg argo-exec -l -p 28333 -- /bin/echo " copy_dom0_files () From patchwork Mon Apr 7 12:31:06 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: 14040376 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 69D1CC369A5 for ; Mon, 7 Apr 2025 12:34:52 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939840.1339857 (Exim 4.92) (envelope-from ) id 1u1lga-0007i8-Hf; Mon, 07 Apr 2025 12:34:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939840.1339857; Mon, 07 Apr 2025 12:34:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u1lga-0007hz-CV; Mon, 07 Apr 2025 12:34:44 +0000 Received: by outflank-mailman (input) for mailman id 939840; Mon, 07 Apr 2025 12:34:42 +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 1u1lgY-0006u9-Ql for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:42 +0000 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id ad007bc2-13ac-11f0-9ffb-bf95429c2676; Mon, 07 Apr 2025 14:34:41 +0200 (CEST) Received: from phl-compute-10.internal (phl-compute-10.phl.internal [10.202.2.50]) by mailfhigh.phl.internal (Postfix) with ESMTP id 75CD8114013D; Mon, 7 Apr 2025 08:34:40 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-10.internal (MEProxy); Mon, 07 Apr 2025 08:34:40 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34:39 -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: ad007bc2-13ac-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=1744029280; x=1744115680; bh=H8oe0eacfK xNq01LDLqm7MI0DtvxX6f0297Icu1U3B8=; b=C6VUBfMRLQiEiap58n4T6sRiEc 4g0pix3/KoV2e4fZU+4BI2IGVoqa+KdhirXYzhtRPjSUrlVl58Lh50az/hqLVXL3 UovN60897MyznrWb6THLBlKWZvDewZdato/R8MzvPzMXbvnV5Ncigb3B0j8b8MMz J6XLjTqt26jSG6wBMpoo/xxKD70hkP5lpYMKoUxjm1VcneKObujGFj+w1Ksrfpsx 5T5vvELmDAAW0SklphHOy2WvDfTDlufuzpxIzjPUfyNGrkjRhuVQOdIoOjws4ZT+ g93EfJCu7ZvA46KdkLxuouBlF0iM7OnZi25EFhlMtB7QOl6Rl+yvnijdP2+g== 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=1744029280; x= 1744115680; bh=H8oe0eacfKxNq01LDLqm7MI0DtvxX6f0297Icu1U3B8=; b=G 0RWU4Z2O4M6bGXGnM8I6fXt8DqRJCmtrYUjWcGTPWK19KefHhM3xvUgNkvzl2lEv xmXQclFZZB6Ik5yZQgI9wvUMPDYaWnJoCGkPpm/BSYtNhHq9KSvn2CYI3sYIL+wf ZKvdmQXZ7xN+84Vc4doHHHVp0bN6cDpVsXxd1IY9Y0RJFu1VtObxAJuyCcSUTG98 uRighQYCH1Y2EAlYOSwUm417poPntTYD/8umaNR9uZTg03MaSefqjMEhI7P5Z5Oa LhuN+755xFHlKNZ+uGcgfzSVp9KuZnXDnVG403HmmH3Yj+GleKqMvBvhX6ojhW+3 WaZwEMj/3jYFrdMK9+wTA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtohepshhsthgrsggvlhhlihhniheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoh eptggrrhguohgvsegtrghrughovgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Stefano Stabellini , Doug Goldstein Subject: [PATCH v2 06/12] CI: consistently use DOCKER_CMD in makefiles Date: Mon, 7 Apr 2025 14:31:06 +0200 Message-ID: <3e28c1267125641ed3212c0366678474692913b2.1744028549.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 This allows rebuilding containers using podman too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini --- automation/build/Makefile | 4 ++-- automation/tests-artifacts/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automation/build/Makefile b/automation/build/Makefile index 4df43b040777..fedf7524dacd 100644 --- a/automation/build/Makefile +++ b/automation/build/Makefile @@ -31,8 +31,8 @@ clean: define CLEAN_RULE .PHONY: clean-$(1) clean-$(1): - if [ -n "$$$$(docker image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \ - docker image rm $(REGISTRY)/$(subst /,:,$(1)); \ + if [ -n "$$$$($(DOCKER_CMD) image ls -q $(REGISTRY)/$(subst /,:,$(1)))" ]; then \ + $(DOCKER_CMD) image rm $(REGISTRY)/$(subst /,:,$(1)); \ fi endef diff --git a/automation/tests-artifacts/Makefile b/automation/tests-artifacts/Makefile index d055cd696bed..80a60a94f3f7 100644 --- a/automation/tests-artifacts/Makefile +++ b/automation/tests-artifacts/Makefile @@ -10,9 +10,9 @@ help: @echo "To push container builds, set the env var PUSH" %: %.dockerfile ## Builds containers - docker build --pull -t $(REGISTRY)/$(@D):$(@F) -f $< $( X-Patchwork-Id: 14040377 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 35931C36010 for ; Mon, 7 Apr 2025 12:34:54 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939841.1339862 (Exim 4.92) (envelope-from ) id 1u1lga-0007mG-V5; Mon, 07 Apr 2025 12:34:44 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939841.1339862; Mon, 07 Apr 2025 12:34:44 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u1lga-0007lv-Nv; Mon, 07 Apr 2025 12:34:44 +0000 Received: by outflank-mailman (input) for mailman id 939841; Mon, 07 Apr 2025 12:34:43 +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 1u1lgZ-0006Bg-6X for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:43 +0000 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id add3e471-13ac-11f0-9eaa-5ba50f476ded; Mon, 07 Apr 2025 14:34:42 +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 C72EE11401EF; Mon, 7 Apr 2025 08:34:41 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Mon, 07 Apr 2025 08:34:41 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34:40 -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: add3e471-13ac-11f0-9eaa-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=1744029281; x=1744115681; bh=vn4e4W4xWz 4ei2euUqprCz3nyrIw2LqvIbqSGRhnE5Y=; b=Ex7vC62DxJw1hPi3VF//AHZnd1 BF192vzYV0nEz7gXW0kJICSmFbUd51EKsSbaDtJCieuJaVKTDAMbM4Pe/aWrfERi w1kjblOE4L1VlvNtnXcBTSB0y7hhObFU/0ISF1iYM1i577Hm7VThzDzOPlGsjRf1 mPhtR2v5wB9QAAmJmeyn7D9X2SQgI0YIlyWUPijfN4WW0IoKcVH98/SSZYJoD3sS V0K3n1JCleW9ryiWSbmQ2brzsR8I3Kj/BoDtOO3KJuo12rhD2FRkvA5EtJG8QwP1 qoG16rsmufzlvKP+97FUI+5YIiRnzasbqwaN5Uf/uTNgVkEGH/1296uYS5eA== 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=1744029281; x= 1744115681; bh=vn4e4W4xWz4ei2euUqprCz3nyrIw2LqvIbqSGRhnE5Y=; b=k zsXtzO+RxOE+mYVPP6fHcYwudfFKIxtEfnLTh0xiSm/Hfv7SdB0mUgjnsrhaq4BI fTfz85wuswv1UWZqRrVGs7/8rSDLiHsXOigx9Ace9ktqDcxB1PS/WD1L2YMA9SU2 A7d4sHEv+Zyr6W/ytgcGlhMAKqbmXNqaXUOzmOOr7tJ4Gvw4zyCPmclLetfm3Pbr RFZXs8guGyRo6XXfhNmZ0SsQ9AYG/Fq65DShYWi8NyPCWTe5hL3k3D6YJYMdHIkS 14gL8FCASmZ8GmhXSCteuGAA9Ooy5jAcxP+2Bh/x8jS1Ix/fK67mz/v3Tj35t1g8 a+hqc1cmJJugi+4bJH8aA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtohepshhsthgrsggvlhhlihhniheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoh eptggrrhguohgvsegtrghrughovgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Stefano Stabellini , Doug Goldstein Subject: [PATCH v2 07/12] CI: wait for the network interface in PCI passthrough tests Date: Mon, 7 Apr 2025 14:31:07 +0200 Message-ID: X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 The network driver initializes asynchronously, and it may not be ready yet by the time the startup script is called. This is especially the case for USB network adapter (where the PCI device is the USB controller) in the upcoming runner. Don't bother about separate timeout - test timeout will cover this part too. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 17fcbd8fa7db..9359e8914fb2 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -104,6 +104,7 @@ on_reboot = "destroy" domU_check=" set -x -e interface=eth0 +while ! [ -e \"/sys/class/net/\$interface\" ]; do sleep 1; done ip link set \"\$interface\" up timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') From patchwork Mon Apr 7 12:31:09 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: 14040378 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 E256CC36010 for ; Mon, 7 Apr 2025 12:34:56 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939848.1339876 (Exim 4.92) (envelope-from ) id 1u1lge-0008Mn-DT; Mon, 07 Apr 2025 12:34:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939848.1339876; Mon, 07 Apr 2025 12:34:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u1lge-0008MW-7f; Mon, 07 Apr 2025 12:34:48 +0000 Received: by outflank-mailman (input) for mailman id 939848; Mon, 07 Apr 2025 12:34:47 +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 1u1lgd-0006u9-4T for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:47 +0000 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id af574415-13ac-11f0-9ffb-bf95429c2676; Mon, 07 Apr 2025 14:34:45 +0200 (CEST) Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.phl.internal (Postfix) with ESMTP id 63843114021F; Mon, 7 Apr 2025 08:34:44 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-12.internal (MEProxy); Mon, 07 Apr 2025 08:34:44 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34:43 -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: af574415-13ac-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=1744029284; x=1744115684; bh=JBSgp/43ku /IG4uH7Ko3Z77z4MQ5/Hj6l9vUJjfz2kg=; b=BAc4354YtgcI0neHhcavWgtaUF ynYy2UNeqj+vvMt7K1AebjZm+rJDf3t0fyEQZNeId2POvgU17Q8nmoj9GwZtjtku 5mWBMsbfsMfh/v5CofaGvRNzmjkOu1cq6++TTL4hOgLMltxJDc57a9n3lj94VA0X ETOnowRi6n0LTPqoffwcHyg9tDGMo3DtmNiwBLFuR1uwT6nohusVvHDFgkngQzF5 BxvAhHJWbwFKzAD4m4l3Feu2oeM5u4OcCGonRCj9i5AiYo5k0Cgv02NekUird0hh lbZ9Z+/Llw+ox9cOcL1B8he6A8dmEOrTCv/VIO1iGfHho2fXcxX0CWksRtXQ== 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=1744029284; x= 1744115684; bh=JBSgp/43ku/IG4uH7Ko3Z77z4MQ5/Hj6l9vUJjfz2kg=; b=f X6h5KuNaa+xuT0oZuexUpmMEw+gt95Zpg6yfbtyVn7vV1Nrp1STDhmLbAuJTxP0W g3uZol9F60qlBFFdffQ2JteFp5BJY9uHoAo3W1EZg4VWFFHQ4UPmgf8XqJ+0ZZdU g5A8VE6Hz5x0YEc95SThXk7uXimm5vcA69qhx+t294MfXQEeXzU3PRHJgiefgIEO FNFFkbfIiOtji1G2I0L+LuinmKWDgCo6CJ0QxuCwKTfek0tevVJhvy7QDLlHns3Q SZBN8GLP7G8Ip/WP409ZpuN3oIkyrV8D7G8XBGdYRv3haUZEvwCxGAx2arJ0JyK6 H1jMs0qcXUjEMNflOA/ag== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpeefnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtohepshhsthgrsggvlhhlihhniheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoh eptggrrhguohgvsegtrghrughovgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Stefano Stabellini , Doug Goldstein Subject: [PATCH v2 09/12] CI: adjust resolving network interface into PCI device Date: Mon, 7 Apr 2025 14:31:09 +0200 Message-ID: <691ab03ad2b1a327a8b2559facec668ab4ce6986.1744028549.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Change how PCI device lookup is done to handle also USB devices, in which case get the USB controller. Instead of taking basename of the 'device' symlink, resolve the full path (example: /sys/devices/pci0000:00/0000:00:09.0/usb4/4-7/4-7:1.0) and take the first part after pci0000:00. Theoretically it could be a bridge, but VM has flat PCI topology. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini --- automation/scripts/qubes-x86-64.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 9359e8914fb2..861e302d845b 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -110,7 +110,8 @@ timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') ping -c 10 \"\$pingip\" echo domU started -pcidevice=\$(basename \$(readlink /sys/class/net/\$interface/device)) +pcidevice=\$(realpath /sys/class/net/\$interface/device | + sed 's#.*pci0000:00/\\([^/]*\\).*#\\1#') lspci -vs \$pcidevice " if [ -n "$PCIDEV_INTR" ]; then From patchwork Mon Apr 7 12:31:10 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: 14040439 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 880C5C36010 for ; Mon, 7 Apr 2025 12:40:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939901.1339896 (Exim 4.92) (envelope-from ) id 1u1lmI-0004H8-Af; Mon, 07 Apr 2025 12:40:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939901.1339896; Mon, 07 Apr 2025 12:40:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u1lmI-0004H1-82; Mon, 07 Apr 2025 12:40:38 +0000 Received: by outflank-mailman (input) for mailman id 939901; Mon, 07 Apr 2025 12:40:37 +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 1u1lge-0006Bg-LU for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:48 +0000 Received: from fhigh-a4-smtp.messagingengine.com (fhigh-a4-smtp.messagingengine.com [103.168.172.155]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b02659ec-13ac-11f0-9eaa-5ba50f476ded; Mon, 07 Apr 2025 14:34:46 +0200 (CEST) Received: from phl-compute-08.internal (phl-compute-08.phl.internal [10.202.2.48]) by mailfhigh.phl.internal (Postfix) with ESMTP id B8382114013D; Mon, 7 Apr 2025 08:34:45 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-08.internal (MEProxy); Mon, 07 Apr 2025 08:34:45 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34:44 -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: b02659ec-13ac-11f0-9eaa-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=1744029285; x=1744115685; bh=bBr+eZXUOc ukuCDFZbX2ITRA0wCf4Pu2nOyRJufUmqM=; b=oLWxl48stmB4k9m+WEpoU33GhF w5K9tlQCQO4SwpqU7z8mSv8sWGk0dyVaRRbTR9n8J19ecBh9nkaLjAGumQaPIPOd 4JhuzRxBzR196XBGlwSaWnPcpu55LAQID0230FMKw6z3MJs2+nw0TdzkkmTj52Al gLYGo9nxhNBvqqj/lU3E6zj5yHYltizGrDoyWP5TWkm7iksOIb+soPGUT8LvF2iF bJ+lnoqfa82joim6XPbAbHayCHDftxlJoChO3BRgWilf9Rp9jTAMmkT7Y8aF1aVn dA2rbIXowY8W952+Hu4yjvirqWRf/hnpX84H/aB6nT5lbxymDG6FNS05asPA== 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=1744029285; x= 1744115685; bh=bBr+eZXUOcukuCDFZbX2ITRA0wCf4Pu2nOyRJufUmqM=; b=D 0vKijYuWx66E1hKtUlss0mwfEJr6lbwgCYSHUWhmE8s2lJ1qzYGdpFWh0ziR4a1C pOUOpqMq7Jbv0NNqdqrWg3xcUpXNqoAF0VE3XtIeZviQkBr3HlSi9hXOneIq+irA pXk3eOyPdODzg5fGR/9puu9oacaeFswa2UMg10fNykpk40YObnYKyKgWK9+GDCNb wH9Ai8toEPSzFfUizuqJ0IY3hD1oq9/fBppuLZTLuY7UI7vK9b+kFXm1YnF/3Fy/ G42bOUXVOC8U3d8DlePQf12HCZqzigkN3RpaE7FRCvC80VcIbWoKrGGdq615LBBm BpKP+yiDHe/eLHl+yImIw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpeffiedtgeevffetledvgefhhfevgffhfeekleehueejjeegvd dvgfffjeeutddvleenucffohhmrghinhepkhgvrhhnvghlrdhorhhgnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgrrhhmrghrvghksehinh hvihhsihgslhgvthhhihhnghhslhgrsgdrtghomhdpnhgspghrtghpthhtohepgedpmhho uggvpehsmhhtphhouhhtpdhrtghpthhtohepgigvnhdquggvvhgvlheslhhishhtshdrgi gvnhhprhhojhgvtghtrdhorhhgpdhrtghpthhtohepmhgrrhhmrghrvghksehinhhvihhs ihgslhgvthhhihhnghhslhgrsgdrtghomhdprhgtphhtthhopehsshhtrggsvghllhhinh hisehkvghrnhgvlhdrohhrghdprhgtphhtthhopegtrghrughovgestggrrhguohgvrdgt ohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Stefano Stabellini , Doug Goldstein Subject: [PATCH v2 10/12] CI: add AMD Zen 4 HW runner Date: Mon, 7 Apr 2025 14:31:10 +0200 Message-ID: <3f825b4bc78916fc537d8bde4a5e49931106bffc.1744028549.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 This is AMD Ryzen 5 7640U in Framework Laptop AMD. It has several things different than the other runners. First of all, the console is using XHCI debug capability. And then, this system doesn't have normal wired ethernet. But is has one on USB, and this one is used for booting. For this, enable CONFIG_USB_RTL8152 in the Linux build. Include some basic tests, plus PCI passthrough. This machine doesn't support S3. S0ix pretends to be working with Qubes's dom0 (kernel + userspace), but it hangs on suspend with Alpine used in test. But even when it doesn't hang, it doesn't really reach deep sleep, so skip this test for now here. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Stefano Stabellini --- Requires containers rebuild, especially tests-artifacts/kernel/6.12.21. Do not apply yet, until issues found by those tests are fixed. That would be at least third issue found using this system, so lets have it in CI. --- automation/gitlab-ci/test.yaml | 56 +++++++++++++- automation/tests-artifacts/kernel/6.12.21.dockerfile | 2 +- 2 files changed, 58 insertions(+) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index a13dd040bd26..feb2dd10ab30 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -188,6 +188,16 @@ tags: - qubes-hw11 +.zen4-x86-64: + extends: .adl-x86-64 + variables: + PCIDEV: "c3:00.4" + PCIDEV_INTR: "MSI-X" + CONSOLE_OPTS: "console=xhci dbgp=xhci@pcic1:00.3,share=yes" + SUT_ADDR: test-12.testnet + tags: + - qubes-hw12 + # Test jobs build-each-commit-gcc: extends: .test-jobs-common @@ -479,6 +489,52 @@ zen3p-tools-tests-pvh-x86-64-gcc-debug: - *x86-64-test-needs - alpine-3.18-gcc-debug +zen4-smoke-x86-64-gcc-debug: + extends: .zen4-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +zen4-smoke-x86-64-dom0pvh gcc-debug: + extends: .zen4-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh dom0pvh 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +zen4-pci-hvm-x86-64-gcc-debug: + extends: .zen4-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +zen4-tools-tests-pv-x86-64-gcc-debug: + extends: .zen4-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pv 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + +zen4-tools-tests-pvh-x86-64-gcc-debug: + extends: .zen4-x86-64 + script: + - ./automation/scripts/qubes-x86-64.sh tools-tests-pvh 2>&1 | tee ${LOGFILE} + artifacts: + reports: + junit: tests-junit.xml + needs: + - *x86-64-test-needs + - alpine-3.18-gcc-debug + qemu-smoke-dom0-arm64-gcc: extends: .qemu-arm64 script: diff --git a/automation/tests-artifacts/kernel/6.12.21.dockerfile b/automation/tests-artifacts/kernel/6.12.21.dockerfile index d7d34031cab5..4e0a68ec61eb 100644 --- a/automation/tests-artifacts/kernel/6.12.21.dockerfile +++ b/automation/tests-artifacts/kernel/6.12.21.dockerfile @@ -19,6 +19,7 @@ RUN apt-get update && \ flex \ bison \ libelf-dev \ + libssl-dev \ && \ apt-get autoremove -y && \ apt-get clean && \ @@ -33,6 +34,7 @@ RUN curl -fsSLO https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-"$LINUX_VERSI scripts/config --enable BRIDGE && \ scripts/config --enable IGC && \ scripts/config --enable TUN && \ + scripts/config --enable USB_RTL8152 && \ cp .config .config.orig && \ cat .config.orig | grep XEN | grep =m |sed 's/=m/=y/g' >> .config && \ make -j$(nproc) bzImage && \ From patchwork Mon Apr 7 12:31:11 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: 14040440 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 CA69DC36010 for ; Mon, 7 Apr 2025 12:41:10 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939934.1339905 (Exim 4.92) (envelope-from ) id 1u1lmf-0005GH-Ki; Mon, 07 Apr 2025 12:41:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939934.1339905; Mon, 07 Apr 2025 12:41:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u1lmf-0005Fo-Gb; Mon, 07 Apr 2025 12:41:01 +0000 Received: by outflank-mailman (input) for mailman id 939934; Mon, 07 Apr 2025 12:41:00 +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 1u1lgh-0006Bg-ML for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:51 +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 b10c42b4-13ac-11f0-9eaa-5ba50f476ded; Mon, 07 Apr 2025 14:34:48 +0200 (CEST) Received: from phl-compute-09.internal (phl-compute-09.phl.internal [10.202.2.49]) by mailfout.phl.internal (Postfix) with ESMTP id 40B931380191; Mon, 7 Apr 2025 08:34:47 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-09.internal (MEProxy); Mon, 07 Apr 2025 08:34:47 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34:45 -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: b10c42b4-13ac-11f0-9eaa-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=1744029287; x=1744115687; bh=0lH0mmLiee 74SgDvco7HYwzx3T1Kyj8W/7DH9aYE+F8=; b=WCD3ukoAQ+QFlMR7aUFHcehRb/ KTUMDZFfWKHggS/01GyH0ELWjyL/zBM59is2SNHAt3uQSEOV4+IyBwQ4YhmECoQ6 Pl+N6l7BEvRZd5d9z626S84UzU7vTRYqbtSmNdT2wm1vnkIJ/SmeT/xFQ0kTLe4P 3z8t76tG6YPossk8YsPy6ajDkyJZvvLtp4+goVeCBdNymhP2PK+DOgsdMHe4IKZr RuXw9cITZF4BjZIgkJK1jAWo6WpBNniAYrUKHIt8ZOxueqBS5rt6Pita48LyR2Ee w8aFtikbDrqKQlIKza2cUcdIamF3QXnfrLKIrkCbgeDcBNuv+SoaKmrUgRoA== 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=1744029287; x= 1744115687; bh=0lH0mmLiee74SgDvco7HYwzx3T1Kyj8W/7DH9aYE+F8=; b=o gW/NnV1ayS2qtraAS0eNIBRNBURb+K/eg/D/RqjGFuhH/fvmLQ3SN9W+3udLqy4W R3UMTgv59L8iRihm3H1s6tXQoHm22zXVnWM7VFbuLbBqZEazqZx48OHZnvtGgsQD lz6sBE7QxSM+bbNkWsTfEsf8y/u04683ov22tShYFcPlvKNBF6nvuMBwInBQXw2H Dr/3OgM4KyWhnouZdsLSXlz05b52Wjf/R+ukR72rOnhIfNNYqqb4z4T5M+Ms/BVC 7y+kxEEfTdf/WtZE4totQd7Xw3NX60niyYrbGDVU6Hi8O9zDciadK8XnrQOTSVsu TIUjg7RWEFJjJyqIMaNOQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvdduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpeelfedtfefgfffghfevhfehvdeileehheffueekieetfeffhf etgefggfejudfggeenucffohhmrghinhepghhithhlrggsrdgtohhmnecuvehluhhsthgv rhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgrrhhmrghrvghksehinh hvihhsihgslhgvthhhihhnghhslhgrsgdrtghomhdpnhgspghrtghpthhtohepgedpmhho uggvpehsmhhtphhouhhtpdhrtghpthhtohepgigvnhdquggvvhgvlheslhhishhtshdrgi gvnhhprhhojhgvtghtrdhorhhgpdhrtghpthhtohepmhgrrhhmrghrvghksehinhhvihhs ihgslhgvthhhihhnghhslhgrsgdrtghomhdprhgtphhtthhopegtrghrughovgestggrrh guohgvrdgtohhmpdhrtghpthhtohepshhsthgrsggvlhhlihhniheskhgvrhhnvghlrdho rhhg X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 11/12] CI: avoid repacking initrd as part of the test job Date: Mon, 7 Apr 2025 14:31:11 +0200 Message-ID: <18391a01aef89e928d04fd746fb6e5e5943df439.1744028549.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 The prerequisite for this is building initrd.cpio.gz, not only initrd.tar.gz. That's a change in the test-artifacts repository. 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. But to modify/extend it, the "overlay" need to be applied already on the target system (otherwise controller host would need to repack it anyway). So, make the initrd.cpio.gz in test-artifacts include boot/initrd-domU already, and add test-specific files as boot/initrd-domU-overlay that is concatenated by dom0 boot script. 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. And since there is now initrd.cpio.gz artifact, rename temporary domU initrd to initrd-domU.cpio.gz Finally, move adding "rc_verbose=yes" to /etc/rc.conf to initrd building. Signed-off-by: Marek Marczykowski-Górecki --- New in v2 In fact, alpine/3.18.dockerfile in this repository is not what is used to build initrd.cpio.gz for test here, but add it anyway in case there are some other tests using it that I missed. If it's really unused, it probably should be removed, but that's a separate patch. Jobs xilinx-* are untested, as I don't have necessary access. --- automation/gitlab-ci/build.yaml | 5 +- automation/scripts/qemu-alpine-x86_64.sh | 11 +-- automation/scripts/qemu-smoke-dom0-arm64.sh | 11 +-- automation/scripts/qemu-smoke-dom0less-arm64.sh | 7 +-- automation/scripts/qubes-x86-64.sh | 29 +++----- automation/scripts/xilinx-smoke-dom0-x86_64.sh | 23 +++--- automation/scripts/xilinx-smoke-dom0less-arm64.sh | 14 +--- automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile | 5 +- automation/tests-artifacts/alpine/3.18.dockerfile | 1 +- 9 files changed, 55 insertions(+), 51 deletions(-) diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml index d41f27fc94bf..8e1ff0178469 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -268,10 +268,13 @@ alpine-3.18-arm64-rootfs-export: extends: .test-jobs-artifact-common image: registry.gitlab.com/xen-project/xen/tests-artifacts/alpine:3.18-arm64v8 script: - - mkdir binaries && cp /initrd.tar.gz binaries/initrd.tar.gz + - mkdir binaries + - cp /initrd.tar.gz binaries/initrd.tar.gz + - cp /initrd.cpio.gz binaries/initrd.cpio.gz artifacts: paths: - binaries/initrd.tar.gz + - binaries/initrd.cpio.gz tags: - arm64 diff --git a/automation/scripts/qemu-alpine-x86_64.sh b/automation/scripts/qemu-alpine-x86_64.sh index 17e2141d625e..9b47b662c3f2 100755 --- a/automation/scripts/qemu-alpine-x86_64.sh +++ b/automation/scripts/qemu-alpine-x86_64.sh @@ -25,20 +25,19 @@ mount -t devtmpfs devtmpfs /dev chmod +x initrd/init # DomU rootfs cd initrd -find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +find . | cpio --create --format='newc' | gzip > ../initrd-domU.cpio.gz cd .. # initrd.tar.gz is Dom0 rootfs 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/* . -mv ../initrd.cpio.gz ./root +mkdir -p root etc/local.d +mv ../initrd-domU.cpio.gz ./root/initrd.cpio.gz cp ../bzImage ./root echo "name=\"test\" memory=512 @@ -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 ../initrd.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 8774a8701232..533b286528f1 100755 --- a/automation/scripts/qemu-smoke-dom0-arm64.sh +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh @@ -24,19 +24,18 @@ mount -t devtmpfs devtmpfs /dev /bin/sh" > initrd/init chmod +x initrd/init cd initrd -find . | cpio --create --format='newc' | gzip > ../initrd.cpio.gz +find . | cpio --create --format='newc' | gzip > ../initrd-domU.cpio.gz 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/* . -mv ../initrd.cpio.gz ./root +mkdir -p etc/local.d root +mv ../initrd-domU.cpio.gz ./root/initrd.cpio.gz cp ../Image ./root echo "name=\"test\" memory=512 @@ -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 ../initrd.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..70085e26c139 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/initrd.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 861e302d845b..399d72e0600d 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -167,13 +167,10 @@ 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,23 +178,23 @@ 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 - sed -i -e 's/^Welcome/domU \0/' etc/issue - find . | fakeroot -i ../fakeroot-save cpio -H newc -o | gzip > ../binaries/domU-rootfs.cpio.gz + echo "domU Welcome to Alpine Linux 3.18 +Kernel \r on an \m (\l) + +" > etc/issue + find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs-overlay.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/ @@ -221,6 +218,8 @@ fi if [ -n "$domU_check" ]; then echo " +# append test-specific files to domU initrd +cat /boot/initrd-domU-overlay >> boot/initrd-domU # get domU console content into test log tail -F /var/log/xen/console/guest-domU.log 2>/dev/null | sed -e \"s/^/(domU) /\" & tail -F /var/log/xen/qemu-dm-domU.log 2>/dev/null | sed -e \"s/^/(qemu-dm) /\" & @@ -234,18 +233,18 @@ 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 cp ../binaries/bzImage boot/vmlinuz if [ -n "$domU_check" ]; then - cp ../binaries/domU-rootfs.cpio.gz boot/initrd-domU + cp ../binaries/domU-rootfs-overlay.cpio.gz boot/initrd-domU-overlay 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/initrd.cpio.gz ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. - TFTP=/scratch/gitlab-runner/tftp CONTROLLER=control@thor.testnet diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh b/automation/scripts/xilinx-smoke-dom0-x86_64.sh index 7834ffbe0593..6b9f0e4a8dc7 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,36 +102,39 @@ 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 -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 +find . | cpio -H newc -o | gzip > ../binaries/domU-rootfs-overlay.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 bash /etc/init.d/xencommons start +# append test-specific files to domU initrd +cat /boot/initrd-domU-overlay >> boot/initrd-domU ${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 +cp ../binaries/domU-rootfs-overlay.cpio.gz boot/initrd-domU-overlay copy_dom0_files -find . | cpio -H newc -o | gzip > ../binaries/dom0-rootfs.cpio.gz +cp ../binaries/initrd.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 b24ad11b8cac..81be60e2026e 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/initrd.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/initrd.cpio.gz ../binaries/dom0-rootfs.cpio.gz +find . | cpio -H newc -o | gzip >> ../binaries/dom0-rootfs.cpio.gz cd .. diff --git a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile index a4542f703997..78d465dc6a39 100644 --- a/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile +++ b/automation/tests-artifacts/alpine/3.18-arm64v8.dockerfile @@ -60,7 +60,10 @@ RUN \ echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab && \ echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ passwd -d "root" root && \ + echo "rc_verbose=yes" >> /etc/rc.conf && \ \ # Create rootfs cd / && \ - tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var + tar cvzf /initrd.tar.gz bin dev etc home init lib mnt opt root sbin usr var && \ + find bin dev etc home init lib mnt opt root sbin usr var |\ + cpio -o -H newc | gzip > /initrd.cpio.gz diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile index 311a92889b87..ff124fef49a8 100644 --- a/automation/tests-artifacts/alpine/3.18.dockerfile +++ b/automation/tests-artifacts/alpine/3.18.dockerfile @@ -61,6 +61,7 @@ RUN \ echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab && \ echo > /etc/modules && \ passwd -d "root" root && \ + echo "rc_verbose=yes" >> /etc/rc.conf && \ \ # Create rootfs cd / && \ From patchwork Mon Apr 7 12:31:12 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: 14040379 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 46F41C3601E for ; Mon, 7 Apr 2025 12:35:05 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939853.1339885 (Exim 4.92) (envelope-from ) id 1u1lgj-0000Uw-N1; Mon, 07 Apr 2025 12:34:53 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939853.1339885; Mon, 07 Apr 2025 12:34:53 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u1lgj-0000UY-ID; Mon, 07 Apr 2025 12:34:53 +0000 Received: by outflank-mailman (input) for mailman id 939853; Mon, 07 Apr 2025 12:34:51 +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 1u1lgh-0006u9-IM for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:51 +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 b1e75ccd-13ac-11f0-9ffb-bf95429c2676; Mon, 07 Apr 2025 14:34:49 +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 AC8171380334; Mon, 7 Apr 2025 08:34:48 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-02.internal (MEProxy); Mon, 07 Apr 2025 08:34:48 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34:47 -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: b1e75ccd-13ac-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=1744029288; x=1744115688; bh=RayiXMebKB VQZ9cR/fh1HsEVnIaXaoIq2vJJNpeCIXQ=; b=hI9fbPYGdd8sBUDcXodPNV+mMP Npw9lz4vw0/wBUzEBG4Jv+d1tGIWSoOYbcyFQ6xVuHAapxbMbuXkEEPeStFdVfkV WvGmQpquqEKp8vtwZv1801XhE+9gvWpQLV3gew97EzBGE574TDti0Xa/PEslNSHE OaLEbdspUfs6YKgxdlpGsQ0EPyUd2i0RwPyWvzCT6kdYmdJ6nR0mKXjv2oX1FESJ LHiUh579rXo+MRwJUaScN56CSNaW0KpaG4KrhOdSaOUl6ElM9HxZLNY02k5+r8pN VQaDhHIkvXeUP1EhRl4BQMtABROeHbPZdrcKFa3FGy7NCZOxxIXaDiLWmpzA== 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=1744029288; x= 1744115688; bh=RayiXMebKBVQZ9cR/fh1HsEVnIaXaoIq2vJJNpeCIXQ=; b=g wO3332R7XyaioCHDeCbr9O9woMKViFedyqd69o5sJLFZuyszSL5zzg2tsLcAKY0D TW95S0BB6Ort8ap8LnYqtDXGk/szlN0GvvyGyhIuuidYblxMCnX2mp4X/pnMIMGV r26ebRjNA3pwaMd54xEByYkc/gSSTs/o4/7X0XM2BX+BgGoPwGM9rEkGi4jKgF9k LRu6xLmYtIltr1HtojXhaSQCf0WDuP6VBUjxpJPicY3xHUaCRorVeBIx8uKT6kwF penSKHF5eIS4uFWXd2W/eByJGYDhuwF/5naeLZqHk1EdFE1+uSQ0Nt5BjUW0XScE PM2nEpNJbCmmVzTGf/5jA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeegpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtoheptggrrhguohgvsegtrghrughovgdrtghomhdprhgtphhtthhopehsshhtrg gsvghllhhinhhisehkvghrnhgvlhdrohhrgh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH v2 12/12] CI: save toolstack artifact as cpio.gz Date: Mon, 7 Apr 2025 14:31:12 +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 9b47b662c3f2..81e8ff24327a 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-domU.cpio.gz ./root/initrd.cpio.gz 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 ../initrd.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 533b286528f1..2e5246f2c9b6 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-domU.cpio.gz ./root/initrd.cpio.gz 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 ../initrd.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 70085e26c139..93f4fb410690 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/initrd.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 399d72e0600d..4fe59fce8999 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -195,7 +195,6 @@ mkdir proc mkdir run mkdir sys mkdir -p etc/local.d -cp -ar ../binaries/dist/install/* . cp -ar ../binaries/tests . cp -a ../automation/scripts/run-tools-tests tests/ @@ -231,8 +230,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 @@ -242,6 +243,7 @@ if [ -n "$domU_check" ]; then fi # take base initrd and append test-specific files cp ../binaries/initrd.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 6b9f0e4a8dc7..ea0f952975c7 100755 --- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh +++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh @@ -115,8 +115,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 @@ -134,6 +133,7 @@ cp ../binaries/bzImage boot/vmlinuz cp ../binaries/domU-rootfs-overlay.cpio.gz boot/initrd-domU-overlay copy_dom0_files cp ../binaries/initrd.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 81be60e2026e..dbb955df0478 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/initrd.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 Mon Apr 7 12:31: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: 14040442 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 EA388C369A2 for ; Mon, 7 Apr 2025 12:41:29 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939988.1339926 (Exim 4.92) (envelope-from ) id 1u1ln2-0006U7-9K; Mon, 07 Apr 2025 12:41:24 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939988.1339926; Mon, 07 Apr 2025 12:41:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u1ln2-0006U0-6K; Mon, 07 Apr 2025 12:41:24 +0000 Received: by outflank-mailman (input) for mailman id 939988; Mon, 07 Apr 2025 12:41:23 +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 1u1lgk-0006Bg-Mt for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:54 +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 b34af22e-13ac-11f0-9eaa-5ba50f476ded; Mon, 07 Apr 2025 14:34:51 +0200 (CEST) Received: from phl-compute-05.internal (phl-compute-05.phl.internal [10.202.2.45]) by mailfout.phl.internal (Postfix) with ESMTP id 068031380191; Mon, 7 Apr 2025 08:34:51 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-05.internal (MEProxy); Mon, 07 Apr 2025 08:34:51 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34:48 -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: b34af22e-13ac-11f0-9eaa-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=1744029291; x=1744115691; bh=jMZW7cjlhb wKeY8FRDYgXIB8LyVP8OV7s9HHJqBF9Wg=; b=dL6SG/2YcZgs20yDd3hxbLWgQE Y4aXUSJi81P6jTXRint3WorBkzfT4p+D8sVz82EHnt+ueFGoHVj7tKFJGZWQSn84 76K/Udk9yEgsDpIrOecxWk5EzlwnbSzf3M0HaH1TcYkcpjwWqTScjMl7si71Ofy6 Pd45IwFfEYZKTTmw98ruUD3SeM7cFkqBxHzXyztD88h9zyLNNzHEzxqNxHQS3rYV iydriVIJ5yUzV9gJwqnDKrdvE/uJs+oY7dLu4pgNe4d45b7hml5pnoRXr0b9ZhDE krxuc23rgTlzhfhH1lWnp2CJRIfWteKJ478/36by7eQ/DP2GAfyLJltRTgKQ== 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=1744029291; x= 1744115691; bh=jMZW7cjlhbwKeY8FRDYgXIB8LyVP8OV7s9HHJqBF9Wg=; b=E +tLdzZY9IyC8LYABSwPwc1XCsHNVi/Jn4ASt0wR5miNyC3PyXPL1ijnXfLhVQMTi sz2yDDZGyGEkhcpTvE9UWTiXTBMHmgwkmQVhDGzvr+PNPcz8hSDwO19zhNNWlKKl wwlovYkpN9OwbrgkuRE8LAreeliB03p0HoJ0r0gdz6JD79x4QE4QhBTrnlw+wdVs mLUMPwc6eOjVh+7hEPLCeHojMOsfONRdW7oC2YWS6I2Pbuy0ZTt5ptnuVRmiQe2l xboRJdbMKOegqG7891ke+et+ZgPi9UjgB4XavjdE9q7NrnIRmXq6hgMnboRzQsrw 9O+WcLKV4Ourz8DFrWekw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvdduucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeelpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtohepshhsthgrsggvlhhlihhniheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoh eprghnughrvgifrdgtohhophgvrhefsegtihhtrhhigidrtghomhdprhgtphhtthhopegr nhhthhhonhihrdhpvghrrghrugesvhgrthgvshdrthgvtghhpdhrtghpthhtohepmhhitg hhrghlrdhorhiivghlsegrmhgurdgtohhmpdhrtghpthhtohepjhgsvghulhhitghhsehs uhhsvgdrtghomhdprhgtphhtthhopehjuhhlihgvnhesgigvnhdrohhrghdprhgtphhtth hopehrohhgvghrrdhprghusegtihhtrhhigidrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Stefano Stabellini , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH test-artifacts v2 13/12] scripts: add rc_verbose=yes to /etc/rc.conf Date: Mon, 7 Apr 2025 14:31:13 +0200 Message-ID: <20250407123448.1520451-1-marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 This is done in every single test job, so do it at the initrd build time. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper --- scripts/x86_64-rootfs-alpine.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/x86_64-rootfs-alpine.sh b/scripts/x86_64-rootfs-alpine.sh index f8b04c5..b70b3a5 100755 --- a/scripts/x86_64-rootfs-alpine.sh +++ b/scripts/x86_64-rootfs-alpine.sh @@ -50,6 +50,7 @@ echo "ttyS0" >> /etc/securetty echo "hvc0" >> /etc/securetty echo "ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100" >> /etc/inittab echo "hvc0::respawn:/sbin/getty -L hvc0 115200 vt100" >> /etc/inittab +echo "rc_verbose=yes" >> /etc/rc.conf echo > /etc/modules passwd -d "root" root From patchwork Mon Apr 7 12:31: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: 14040441 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 C687FC369A2 for ; Mon, 7 Apr 2025 12:41:19 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.939957.1339916 (Exim 4.92) (envelope-from ) id 1u1lmr-0005q6-1B; Mon, 07 Apr 2025 12:41:13 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 939957.1339916; Mon, 07 Apr 2025 12:41:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u1lmq-0005py-Un; Mon, 07 Apr 2025 12:41:12 +0000 Received: by outflank-mailman (input) for mailman id 939957; Mon, 07 Apr 2025 12:41:11 +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 1u1lgp-0006Bg-OG for xen-devel@lists.xenproject.org; Mon, 07 Apr 2025 12:34:59 +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 b4947446-13ac-11f0-9eaa-5ba50f476ded; Mon, 07 Apr 2025 14:34:54 +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 2DE761380319; Mon, 7 Apr 2025 08:34:53 -0400 (EDT) Received: from phl-mailfrontend-02 ([10.202.2.163]) by phl-compute-11.internal (MEProxy); Mon, 07 Apr 2025 08:34:53 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Mon, 7 Apr 2025 08:34:51 -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: b4947446-13ac-11f0-9eaa-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=1744029293; x=1744115693; bh=va+AU7XSH2 JkS6D22fCg+3+hIvHKU1o8Xr6qRtSJn7c=; b=R09hXLgAxPzDGlVzqYC/BPPTPv Wl4LfZ6146rX4XbczO1P7cKNJYbhOCCzGcGpUCu22SdxHHDoJyRz6VTLss8RjgDV uXFG2YSIQExJpkWbH/FDIRDrbXqGV6PON5xAaNFNSCv7/35fHrKysE5IZTrNkfmo 7/mgK9AQxEVKJ9OMUe3EBcAEfnr3mjKBP84Bs7Mdb5Cw2THqBjyn02CSc48JAqYH imMz7z5fLODwI0Pi3SJFBUX35xYVnQZOIuR8RowM29CVXja5+HrSZJy//Kj3cTQi egS0oVRPiT2NYxQYb8eisjgPVzbhyFFAHF27e8fUzRg5u0iHuSB0fEYOAiKg== 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=1744029293; x= 1744115693; bh=va+AU7XSH2JkS6D22fCg+3+hIvHKU1o8Xr6qRtSJn7c=; b=Z 3z/i1anbVVS9SbprXuMHD4y/D5Y34SbaYFVB+YU9cHKy2wJohEEtRQ324UgZuJal lZP+lqG2AFVLpxyGfBkDcy8wbTV/IBNQJ9DPG6sKFwIiem/AzwMbv7zKZFefwZ5/ a30JaPEGlS7n3OzKYkbPAh3hn0QKTEi7DzE0OK0K2xRffnHfIIq/2Go9ofj1xeqF uBovQoXplWubAPUFd7kKZ3x/xK0ownJ2912AuRxWujUqE1+nHbnCIl4cJEOJmmUn k+8kxE1P19Dg7prXEW6cDw6yKlJ9hYsScaTyr1GeAgiKbhKHX8/6kwdE0eO0ch46 KYen0vbJ5k6x09kIfZ5Qg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvtddtvddtucetufdoteggodetrf dotffvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggv pdfurfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpih gvnhhtshculddquddttddmnecujfgurhephffvvefufffkofgjfhggtgfgsehtkeertder tdejnecuhfhrohhmpeforghrvghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkih cuoehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeen ucggtffrrghtthgvrhhnpefgueduhefgvdefheehudejheefudevueeghfekhfehleegve duteeuiedugffgffenucevlhhushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhl fhhrohhmpehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtoh hmpdhnsggprhgtphhtthhopeelpdhmohguvgepshhmthhpohhuthdprhgtphhtthhopeig vghnqdguvghvvghlsehlihhsthhsrdigvghnphhrohhjvggtthdrohhrghdprhgtphhtth hopehmrghrmhgrrhgvkhesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmpdhr tghpthhtohepshhsthgrsggvlhhlihhniheskhgvrhhnvghlrdhorhhgpdhrtghpthhtoh eprghnughrvgifrdgtohhophgvrhefsegtihhtrhhigidrtghomhdprhgtphhtthhopegr nhhthhhonhihrdhpvghrrghrugesvhgrthgvshdrthgvtghhpdhrtghpthhtohepmhhitg hhrghlrdhorhiivghlsegrmhgurdgtohhmpdhrtghpthhtohepjhgsvghulhhitghhsehs uhhsvgdrtghomhdprhgtphhtthhopehjuhhlihgvnhesgigvnhdrohhrghdprhgtphhtth hopehrohhgvghrrdhprghusegtihhtrhhigidrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= , Stefano Stabellini , Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH test-artifacts v2 14/12] scripts: build initrd cpio Date: Mon, 7 Apr 2025 14:31:14 +0200 Message-ID: <20250407123448.1520451-2-marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 Build initrd format directly digestable by the kernel. Additionally, include it itself inside as boot/initrd-domU file, for domU booting in tests. This should avoid the need to repack tar -> cpio as part of the test job. Keep generating initrd.tar.gz as that's still used by older branches. Signed-off-by: Marek Marczykowski-Górecki Reviewed-by: Andrew Cooper --- scripts/x86_64-rootfs-alpine.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/x86_64-rootfs-alpine.sh b/scripts/x86_64-rootfs-alpine.sh index b70b3a5..13e85fa 100755 --- a/scripts/x86_64-rootfs-alpine.sh +++ b/scripts/x86_64-rootfs-alpine.sh @@ -58,3 +58,8 @@ passwd -d "root" root cd / tar cvzf "${WORKDIR}/binaries/initrd.tar.gz" \ bin dev etc home init lib mnt opt root sbin usr var +mkdir boot +find bin dev etc home init lib mnt opt root sbin usr var |\ + cpio -o -H newc | gzip > boot/initrd-domU +find bin boot dev etc home init lib mnt opt root sbin usr var |\ + cpio -o -H newc | gzip > "${WORKDIR}/binaries/initrd.cpio.gz" \