From patchwork Fri Oct 6 02:05:15 2023 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: 13410924 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 E4B26E92FD5 for ; Fri, 6 Oct 2023 02:06:04 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.613207.953594 (Exim 4.92) (envelope-from ) id 1qoaDn-0006mE-T3; Fri, 06 Oct 2023 02:05:43 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 613207.953594; Fri, 06 Oct 2023 02:05:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qoaDn-0006ll-ND; Fri, 06 Oct 2023 02:05:43 +0000 Received: by outflank-mailman (input) for mailman id 613207; Fri, 06 Oct 2023 02:05: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 1qoaDm-0006iG-8I for xen-devel@lists.xenproject.org; Fri, 06 Oct 2023 02:05:42 +0000 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d6a105f6-63ec-11ee-9b0d-b553b5be7939; Fri, 06 Oct 2023 04:05:36 +0200 (CEST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id C2DD75C030A; Thu, 5 Oct 2023 22:05:35 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 05 Oct 2023 22:05:35 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Oct 2023 22:05:34 -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: d6a105f6-63ec-11ee-9b0d-b553b5be7939 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:sender :subject:subject:to:to; s=fm2; t=1696557935; x=1696644335; bh=nH ktnuR1LIoxBK0JLNtSz/hwE9AIqkiBxUTneESqhUo=; b=xezwTP9LNjstEVVq8y wJZyuDDgKDDcZkI1oOusGThT5vSYNbKfFI0Ro0H6/raa+68zlMvIHU4TH2Vg2lYa 6LHU0GUeEKLQ5oiEU0NBZrFKfi0gVQeQh0fwm5VWncXNmzzgj9twj4YnD/g1MmNC mn6FwXU/l3M19LKcJEZn0xTSqCWPsR6PgxO8w1PmHfT7jgaKZlnzEmchP/LobGf2 B0Rsay+qk0twVfzRg0JGfNGlRKxoptThLu1/j8tWEjLcHLyyiTMW44+mKUf8rSN1 dU1UJNOCE74mNJXGy8FRLaR7fEIgj+2kC1Jzx4VD27NSrNKulLneouRcGetAMdZQ 0lHA== 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:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1696557935; x=1696644335; bh=nHktnuR1LIoxBK0JLNtSz/hwE9AIqkiBxUT neESqhUo=; b=nFleuiCRPyCob8HQfWIjAbSMc56J4J4vtH5/eKrQLV2DrwBd/sN WaiLfhMbK6mLTLTTtytLahyMPj0zJuMwE9YdqSLFAgeHzVcfLAY4Z7UcrRBEON26 UzCILwdS7w81HrsGYI1EghjMtLS0gm9/NSt7VZrMOQHU9eu3+xpMTyuUiGdvsQHU FykBtJKnjfwsGogW0+T1anR5rLlaEHMyY69uxTJOCH7/AeNxnWFmGT0OYgmXR0/F VWOK3v2E+VWAsePksBomwQLZjdIf8Ti85BRquSPk5ilmQFcBL9dDzz/SRc826i4D Zp7FxPIcee0fuCglrhZy4T6WQFK74ROFLfw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgeehgdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepofgrrhgv khcuofgrrhgtiiihkhhofihskhhiqdfikphrvggtkhhiuceomhgrrhhmrghrvghksehinh hvihhsihgslhgvthhhihhnghhslhgrsgdrtghomheqnecuggftrfgrthhtvghrnhepgfeu udehgfdvfeehhedujeehfeduveeugefhkefhheelgeevudetueeiudfggfffnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgrrhhmrghrvghk sehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Henry Wang , =?utf-8?q?Marek_Marczykowski-G=C3=B3rec?= =?utf-8?q?ki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 1/5] automation: include real-time view of the domU console log too Date: Fri, 6 Oct 2023 04:05:15 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Passthrough domU console log to the serial console in real time, not only after the test. First of all, this gives domU console also in case of test failure. But also, allows correlation between domU and dom0 or Xen messages. To avoid ambiguity, add log prefix with 'sed'. Signed-off-by: Marek Marczykowski-Górecki --- automation/scripts/qubes-x86-64.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 5f6052eef041..1e84e40a4afc 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -33,8 +33,6 @@ echo \"${passed}\" until grep -q \"${passed}\" /var/log/xen/console/guest-domU.log; do sleep 1 done -# get domU console content into test log -tail -n 100 /var/log/xen/console/guest-domU.log echo \"${passed}\" " if [ "${test_variant}" = "dom0pvh" ]; then @@ -59,8 +57,6 @@ echo deep > /sys/power/mem_sleep echo mem > /sys/power/state # now wait for resume sleep 5 -# get domU console content into test log -tail -n 100 /var/log/xen/console/guest-domU.log xl list xl dmesg | grep 'Finishing wakeup from ACPI S3 state' || exit 1 # check if domU is still alive @@ -121,7 +117,6 @@ echo \"${passed}\" until grep -q \"^domU Welcome to Alpine Linux\" /var/log/xen/console/guest-domU.log; do sleep 1 done -tail -n 100 /var/log/xen/console/guest-domU.log " fi @@ -169,6 +164,8 @@ ifconfig eth0 up 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 ${dom0_check} " > etc/local.d/xen.start From patchwork Fri Oct 6 02:05:16 2023 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: 13410927 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 C95A7E92FD4 for ; Fri, 6 Oct 2023 02:06:13 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.613208.953607 (Exim 4.92) (envelope-from ) id 1qoaDp-0007DA-2c; Fri, 06 Oct 2023 02:05:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 613208.953607; Fri, 06 Oct 2023 02:05:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qoaDo-0007D3-Ub; Fri, 06 Oct 2023 02:05:44 +0000 Received: by outflank-mailman (input) for mailman id 613208; Fri, 06 Oct 2023 02:05:43 +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 1qoaDn-0006iG-8M for xen-devel@lists.xenproject.org; Fri, 06 Oct 2023 02:05:43 +0000 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d7845d08-63ec-11ee-9b0d-b553b5be7939; Fri, 06 Oct 2023 04:05:38 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 44F655C0308; Thu, 5 Oct 2023 22:05:37 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 05 Oct 2023 22:05:37 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Oct 2023 22:05: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: d7845d08-63ec-11ee-9b0d-b553b5be7939 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:sender :subject:subject:to:to; s=fm2; t=1696557937; x=1696644337; bh=/0 k9WHwXNqvWmO3gj4B3oauirCAI88+YlsPrCwqgrk4=; b=LeRY9LYMU2+CimbFn/ biABePlO+sO2lLVhYYLXg29MT0pTbVBUog8wyRDkmHBWfA+YaRVP02Wv1XNcmDFR vqV72HZhQmCSAOmFJQB831K9RLyUS/BekINe4Pphy694R0w8xT3+RDiimR6vxdAL 492ZrZdPv6DsmtLmWLqdA1UI2x2QdsQD2xtnLFsPFx9GPxPm+3hsh9qqyESzLBVB alGVlDfKcZkjozjye/yFFYOky7r6AybGG8hf+dvnOAS4hyDR0wn+Zzy4Lxc0RxT5 FdIfQJ9bVzhlLM0IRY0zSrqYuV/7zicmmHX4TBehnXVNjcUINBbePE6xk/kH01XM 39fA== 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:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1696557937; x=1696644337; bh=/0k9WHwXNqvWmO3gj4B3oauirCAI88+YlsP rCwqgrk4=; b=Xs0G7DOjMWEqyvZDLUEXYCFMTXQtXo5AePfTJoy6K/FaGIFulxq 3K9IUdiQQfCf66N1al3sSNfKucLSo4BYYZULJH4nfbgmu/JvqeCjUdYSI0o1jAn0 BpmY8ufTr0CloRit+EC4CLi9oGu0g8H1Uen4P5Npiw1poML+e4yxxEBt0fI1/dgq 7limGskMroHaaxoQc/dP/mE+9OAqlJkZwRinJJOPJcT05MNn5+uartxa/uPuGW1c 33SofTZzYGSorP60VZETH6eebwR8QmMeebLQO4qpny4YkxH1mg/LCUzIhloz79Yk CH2ZiF3L0G7Y0tHJcn+MeK9FSdyLgDOHwiQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgeehgdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepofgrrhgv khcuofgrrhgtiiihkhhofihskhhiqdfikphrvggtkhhiuceomhgrrhhmrghrvghksehinh hvihhsihgslhgvthhhihhnghhslhgrsgdrtghomheqnecuggftrfgrthhtvghrnhepgfeu udehgfdvfeehhedujeehfeduveeugefhkefhheelgeevudetueeiudfggfffnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgrrhhmrghrvghk sehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Henry Wang , =?utf-8?q?Marek_Marczykowski-G=C3=B3rec?= =?utf-8?q?ki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 2/5] automation: hide timeout countdown in log Date: Fri, 6 Oct 2023 04:05:16 +0200 Message-ID: <126f25fd791aa1f3e32463e600c59967504e19b6.1696557834.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 grep+sleep message every 1s makes job log unnecessary hard to read. Signed-off-by: Marek Marczykowski-Górecki --- I know I can download serial log file, but that's 3 more clicks... --- 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 1e84e40a4afc..5464d10fc343 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -222,10 +222,12 @@ if [ -n "$wait_and_wakeup" ]; then 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 From patchwork Fri Oct 6 02:05:17 2023 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: 13410926 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 01189E92FD7 for ; Fri, 6 Oct 2023 02:06:04 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.613209.953612 (Exim 4.92) (envelope-from ) id 1qoaDp-0007GY-B8; Fri, 06 Oct 2023 02:05:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 613209.953612; Fri, 06 Oct 2023 02:05:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qoaDp-0007Fx-5j; Fri, 06 Oct 2023 02:05:45 +0000 Received: by outflank-mailman (input) for mailman id 613209; Fri, 06 Oct 2023 02:05: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 1qoaDn-0006iR-Ht for xen-devel@lists.xenproject.org; Fri, 06 Oct 2023 02:05:43 +0000 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d8627954-63ec-11ee-98d3-6d05b1d4d9a1; Fri, 06 Oct 2023 04:05:40 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id BABED5C02C3; Thu, 5 Oct 2023 22:05:38 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Thu, 05 Oct 2023 22:05:38 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Oct 2023 22:05: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: d8627954-63ec-11ee-98d3-6d05b1d4d9a1 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:sender :subject:subject:to:to; s=fm2; t=1696557938; x=1696644338; bh=rY iD5wjT5lR/FmYnOgmeYV6aNTCLJNrgwGj8H4KUxtg=; b=UlzKbUIBbxLJr3a8gX YqxLVjLx3sMfERwZ556FD+jTPz3nnCLBgURZ8bW/7ScweJ5tZJCMs2Xanj7V+cxw cdh1vT6+Rg2m8RmVo95GXltF2oUv1e5PIbegfEtzNAq214yd301CLyhRQn5kkulk 1TYYrM9Ii8RsCBAc80/2YFPoMEc1yIUGHdK+szWP5LpLBFnugpojVnkUP7z9zD1S A/mLJnuecr9L9LbWpi6iTwF68ppVcohMZTkTznb2q4X4R3hi3XC+A9EPPWPB9Bnl SR3cHO626IrAZvE3R5Z22LOzjyFmb6DKD2JiUiFjvkqXrPGe4aqEiSC2fxvz/O1t rICQ== 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:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1696557938; x=1696644338; bh=rYiD5wjT5lR/FmYnOgmeYV6aNTCLJNrgwGj 8H4KUxtg=; b=P6u5ijZAvXBsuuCbCheNwBNEnH6dmGP9CyiFjJmbifPEqFolUX2 TXS/QyCER/JTrJLa3lBHC557/rPSOie2JpXd+AK0YUoVELG5Ein4GscXdU/CdksM aEeCtYmhKOrqzKaQPTBitFD2G6Casy4rQV83JR6bqWP0hrM58hTKsIzDVjDw45lk OxXuhc4KA5Fnndh3ueGYSpaxQ8yHm0AdYjWnUJZsJMzQ/mLuAwMxEcpZnTwPY77T tcS5bS6LAMxy7NiMvEK6F5FVu7mdgdmJrVKvhuBNHbmJ6UXSIp5KFHmA30PZ++ag ATX0OMO5e1o/ZDnJEZ1StmndK/WM9n7Id+A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgeehgdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepofgrrhgv khcuofgrrhgtiiihkhhofihskhhiqdfikphrvggtkhhiuceomhgrrhhmrghrvghksehinh hvihhsihgslhgvthhhihhnghhslhgrsgdrtghomheqnecuggftrfgrthhtvghrnhepgfeu udehgfdvfeehhedujeehfeduveeugefhkefhheelgeevudetueeiudfggfffnecuvehluh hsthgvrhfuihiivgepudenucfrrghrrghmpehmrghilhhfrhhomhepmhgrrhhmrghrvghk sehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Henry Wang , =?utf-8?q?Marek_Marczykowski-G=C3=B3rec?= =?utf-8?q?ki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 3/5] automation: cleanup test alpine install Date: Fri, 6 Oct 2023 04:05:17 +0200 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Remove parts of initramfs for the test system (domU, and in few tests dom0 too) that are not not working and are not really needed in this simple system. This makes the test log much lighter on misleading error messages. Signed-off-by: Marek Marczykowski-Górecki --- automation/tests-artifacts/alpine/3.18.dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile index 32aa8e177847..333951d05e84 100644 --- a/automation/tests-artifacts/alpine/3.18.dockerfile +++ b/automation/tests-artifacts/alpine/3.18.dockerfile @@ -40,7 +40,6 @@ RUN \ rc-update add udev && \ rc-update add udev-trigger && \ rc-update add udev-settle && \ - rc-update add networking sysinit && \ rc-update add loopback sysinit && \ rc-update add bootmisc boot && \ rc-update add devfs sysinit && \ @@ -48,18 +47,17 @@ RUN \ rc-update add hostname boot && \ rc-update add hwclock boot && \ rc-update add hwdrivers sysinit && \ - rc-update add killprocs shutdown && \ - rc-update add modloop sysinit && \ rc-update add modules boot && \ + rc-update add killprocs shutdown && \ rc-update add mount-ro shutdown && \ rc-update add savecache shutdown && \ - rc-update add sysctl boot && \ rc-update add local default && \ cp -a /sbin/init /init && \ 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 > /etc/modules && \ passwd -d "root" root && \ \ # Create rootfs From patchwork Fri Oct 6 02:05:18 2023 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: 13410925 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 24E0EE92FD8 for ; Fri, 6 Oct 2023 02:06:06 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.613210.953621 (Exim 4.92) (envelope-from ) id 1qoaDp-0007TL-VF; Fri, 06 Oct 2023 02:05:45 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 613210.953621; Fri, 06 Oct 2023 02:05:45 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qoaDp-0007RP-Nr; Fri, 06 Oct 2023 02:05:45 +0000 Received: by outflank-mailman (input) for mailman id 613210; Fri, 06 Oct 2023 02:05:44 +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 1qoaDn-0006iR-Tp for xen-devel@lists.xenproject.org; Fri, 06 Oct 2023 02:05:43 +0000 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id d9464c7e-63ec-11ee-98d3-6d05b1d4d9a1; Fri, 06 Oct 2023 04:05:41 +0200 (CEST) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 3D8F25C0308; Thu, 5 Oct 2023 22:05:40 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Thu, 05 Oct 2023 22:05:40 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Oct 2023 22:05:38 -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: d9464c7e-63ec-11ee-98d3-6d05b1d4d9a1 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:sender :subject:subject:to:to; s=fm2; t=1696557940; x=1696644340; bh=/g Ul0Y4cOMR9LD5olCpH8YTdnvy+vSoAh/p2y/HuRgc=; b=Ut4sTEgCJe/T5EI9YH 8vXs7bXEl7oicPQXlw+Yzif3J6/O/j6JhQoF3fRa2+WkL/ESjjYgATQfhHh4FWcb uIJSm0AQ17DJu/JZyDOSE3yMxYJz+o2jWBUhnCyfYspk0U7v2tc5zCIbS1qeeEEn X7t+iH4u1o/AQdUKMXqlEe0UyYnPMrFDKHpLrufBLgIh8Y3owfwRqGi1wJfs9iMZ clhPt6FmEdzJWstRtm4uKnD9bvLy+oMM9AaM57fLqRZSZS0aHx1CgBfo7nt2eMee qwsPz09YYKJS84VnG/fcIBn0fc9ta3dLhQPzTr0LrcIeABaW50KHpNuUMdAyOa3o LRlw== 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:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1696557940; x=1696644340; bh=/gUl0Y4cOMR9LD5olCpH8YTdnvy+vSoAh/p 2y/HuRgc=; b=IzE/swSNreJkRnOHr//0+PEw71dhsW+yv/DA35+YM+fBzPgfazl Ddx79/cS7q6DBiJiUEDbIT8qYVhtu1E3zpffben/e22C5lxiWMPMfnCB48K4uBld Iqy3u6Dk0dvQlX1GnLWqwdNT00m2XZurdbJhyXCB0cHfyZGkt8kTdZBRZ5cXP9Hf qX3lL/UOd9R7ZbeImvsx9uQ2kpF1xTtytPp1c624AitQ+qWCh2kt65hyeNAESDGc lbEEHasuXNB8O4iiRXQNH+iU0gKidgWWwVg8BSsfitVEgZbneXeY4PxVuWyHDvY6 BRIIyH/bFK3qY5uPO+f81yCnVfD5Fkj5mxQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgeehgdehhecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepofgrrhgv khcuofgrrhgtiiihkhhofihskhhiqdfikphrvggtkhhiuceomhgrrhhmrghrvghksehinh hvihhsihgslhgvthhhihhnghhslhgrsgdrtghomheqnecuggftrfgrthhtvghrnhepgfeu udehgfdvfeehhedujeehfeduveeugefhkefhheelgeevudetueeiudfggfffnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgrrhhmrghrvghk sehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Henry Wang , =?utf-8?q?Marek_Marczykowski-G=C3=B3rec?= =?utf-8?q?ki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 4/5] automation: improve checking for MSI/MSI-X in PCI passthrough tests Date: Fri, 6 Oct 2023 04:05:18 +0200 Message-ID: <18b10f667f2df986691ed299f7640724618ec95a.1696557834.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Checking /proc/interrupts is unreliable because different drivers set different names there. Install pciutils and use lspci instead. In fact, the /proc/interrupts content was confusing enough that adl-pci-hvm had it wrong (MSI-X is in use there). Fix this too. Signed-off-by: Marek Marczykowski-Górecki --- automation/gitlab-ci/test.yaml | 2 +-- automation/scripts/qubes-x86-64.sh | 19 +++++----------- automation/tests-artifacts/alpine/3.18.dockerfile | 1 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 4b836bf04784..61e642cce0cc 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -195,8 +195,6 @@ adl-pci-pv-x86-64-gcc-debug: adl-pci-hvm-x86-64-gcc-debug: extends: .adl-x86-64 - variables: - PCIDEV_INTR: "MSI" script: - ./automation/scripts/qubes-x86-64.sh pci-hvm 2>&1 | tee ${LOGFILE} needs: diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 5464d10fc343..842e6fae7204 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -90,23 +90,18 @@ on_reboot = "destroy" domU_check=" set -x -e -ip link set eth0 up -timeout 30s udhcpc -i eth0 +interface=eth0 +ip link set \"\$interface\" up +timeout 30s udhcpc -i \"\$interface\" pingip=\$(ip -o -4 r show default|cut -f 3 -d ' ') ping -c 10 \"\$pingip\" echo domU started -cat /proc/interrupts +pcidevice=\$(basename \$(readlink /sys/class/net/\$interface/device)) +lspci -vs \$pcidevice " - if [ "$PCIDEV_INTR" = "MSI-X" ]; then + if [ -n "$PCIDEV_INTR" ]; then domU_check="$domU_check -grep -- '\\(-msi-x\\|PCI-MSI-X\\).*eth0' /proc/interrupts -" - elif [ "$PCIDEV_INTR" = "MSI" ]; then - # depending on the kernel version and domain type, the MSI can be - # marked as '-msi', 'PCI-MSI', or 'PCI-MSI-'; be careful to not match - # -msi-x nor PCI-MSI-X - domU_check="$domU_check -grep -- '\\(-msi \\|PCI-MSI\\( \\|-[^X]\\)\\).*eth0' /proc/interrupts +lspci -vs \$pcidevice | fgrep '$PCIDEV_INTR: Enable+' " fi domU_check="$domU_check diff --git a/automation/tests-artifacts/alpine/3.18.dockerfile b/automation/tests-artifacts/alpine/3.18.dockerfile index 333951d05e84..5f521572b8fb 100644 --- a/automation/tests-artifacts/alpine/3.18.dockerfile +++ b/automation/tests-artifacts/alpine/3.18.dockerfile @@ -33,6 +33,7 @@ RUN \ apk add pixman && \ apk add curl && \ apk add udev && \ + apk add pciutils && \ \ # Xen cd / && \ From patchwork Fri Oct 6 02:05:19 2023 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: 13410922 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 D2DA1E92FD4 for ; Fri, 6 Oct 2023 02:06:03 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.613211.953627 (Exim 4.92) (envelope-from ) id 1qoaDq-0007Y0-AA; Fri, 06 Oct 2023 02:05:46 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 613211.953627; Fri, 06 Oct 2023 02:05:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qoaDq-0007WJ-0U; Fri, 06 Oct 2023 02:05:46 +0000 Received: by outflank-mailman (input) for mailman id 613211; Fri, 06 Oct 2023 02:05:44 +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 1qoaDo-0006iG-8T for xen-devel@lists.xenproject.org; Fri, 06 Oct 2023 02:05:44 +0000 Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id da2474ef-63ec-11ee-9b0d-b553b5be7939; Fri, 06 Oct 2023 04:05:42 +0200 (CEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id A77E95C0346; Thu, 5 Oct 2023 22:05:41 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Thu, 05 Oct 2023 22:05:41 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 5 Oct 2023 22:05: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: da2474ef-63ec-11ee-9b0d-b553b5be7939 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:sender :subject:subject:to:to; s=fm2; t=1696557941; x=1696644341; bh=xU VmAHd/upd/HZf/2/vIJOjnVKPpjlKUVUtDDxC5laI=; b=WMr8VMYVeaAIYcJhht t+fPdJi4ksa1jU27ABf5bi1Bwvghhe6EoYH4+VJNjlvlc/3qyvPIqpt3te1RgGtn YBocQqddSHtJJ++sHhy4aYRkJDZk1m7oeOczcKW45w0cyynKEjZxT2SizUOvTqwE CiQdO1umXr9iVgY88W7RH97obnvmsEdSqgxA/XDKB0YBT+pnZf+0kulelt2pwMBR w5TgPqCQO57WH9gdRZ8okhg17t2YQ3w5AW7qGS3Z6fvX+UVjuhnP71FXSAKr4t9W Z0Non/g2S4t6YstN9emrAuQT9B7dT3+tsmdmy5w6oxTtujbZ5sBwYi7xkevoVs6v kZwQ== 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:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1696557941; x=1696644341; bh=xUVmAHd/upd/HZf/2/vIJOjnVKPpjlKUVUt DDxC5laI=; b=U0SvVFbQOSN9+HsQMuN5UB63ruRmHXyzsQ+RL7Q8evZnOlZ9pW4 QRU3IRP7vRl9ucXBuBX/WnT+yEawh8uzznrS8LBPuzEqxPYlXs1jc2Tku0mHbIqQ 36F8NT1cCNIDqua5EbGGXJLGqC4+1FpnI/vxnCcX3LuSKE+og5SKtudQyLm96VR3 URjtpNS5Tfxlp5Q30pWcDXfdgwC26tRiOtQ5s1RsZNmZ7Er5ckOBg7mvCPXDxoJc NdHsz8rwgk4juAE4fS06jMaJH6XtGDqLscR4bZAUGIqINrKhOjMocFyGallbimUL MdUGyigcWhNHrJpHlpsyX2eKX1gAL/ebI0g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgeehgdehgecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomhepofgrrhgv khcuofgrrhgtiiihkhhofihskhhiqdfikphrvggtkhhiuceomhgrrhhmrghrvghksehinh hvihhsihgslhgvthhhihhnghhslhgrsgdrtghomheqnecuggftrfgrthhtvghrnhepgfeu udehgfdvfeehhedujeehfeduveeugefhkefhheelgeevudetueeiudfggfffnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgrrhhmrghrvghk sehinhhvihhsihgslhgvthhhihhnghhslhgrsgdrtghomh X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Henry Wang , =?utf-8?q?Marek_Marczykowski-G=C3=B3rec?= =?utf-8?q?ki?= , Doug Goldstein , Stefano Stabellini Subject: [PATCH 5/5] automation: extract QEMU log in relevant hardware tests Date: Fri, 6 Oct 2023 04:05:19 +0200 Message-ID: <7844dbd88559ac5a52c0511bcfbc33cf835e9f56.1696557834.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Let it be printed to the console too. QEMU and Linux messages have different enough format that it should be possible to distinguish them. Signed-off-by: Marek Marczykowski-Górecki --- 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 842e6fae7204..fe80a1c84308 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -109,6 +109,7 @@ 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