From patchwork Wed Apr 26 00:16:14 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: 13223914 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 0ACE7C77B7C for ; Wed, 26 Apr 2023 00:17:02 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.526383.818116 (Exim 4.92) (envelope-from ) id 1prSpu-0000z3-5x; Wed, 26 Apr 2023 00:16:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 526383.818116; Wed, 26 Apr 2023 00:16: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 1prSpu-0000xw-1a; Wed, 26 Apr 2023 00:16:42 +0000 Received: by outflank-mailman (input) for mailman id 526383; Wed, 26 Apr 2023 00:16: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 1prSps-0008T0-LV for xen-devel@lists.xenproject.org; Wed, 26 Apr 2023 00:16:40 +0000 Received: from wout2-smtp.messagingengine.com (wout2-smtp.messagingengine.com [64.147.123.25]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9d048d4c-e3c7-11ed-b223-6b7b168915f2; Wed, 26 Apr 2023 02:16:40 +0200 (CEST) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.west.internal (Postfix) with ESMTP id 504E7320046F; Tue, 25 Apr 2023 20:16:38 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Tue, 25 Apr 2023 20:16:38 -0400 Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 25 Apr 2023 20:16: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: 9d048d4c-e3c7-11ed-b223-6b7b168915f2 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=fm3; t=1682468197; x=1682554597; bh=Cq ssG/KC+YvF49hzLtSeRQGnmHXkLm9FnGPzRc0yuiY=; b=FkqRwE5Bn4jO0B0CS/ TA+FHAAPJoTdI9VsGJaqkUmHip3J6zjja/1Nphj3Lgj67Cfv1kc1dPb3QlVmvZoI 5by8SuHpWAk8sGhk09E/d7Bwks8yjaFvXfhaXFkoK6A/9sEIGbgOnNjVjf3RtTKA 1gMcgauVczqX7Pn43DCF081X3hi/agBhsJwx5mq4VjATPJ7NB0VwT4ZnrrjryXUz qAI5IypjsCegE3uqK6ip5W34Jo/RQ/s4wJEZSZi1cVTiKpHor3QENZ/z9xOT83h2 8QHEDmBZn9do+Fj48WK8i0pPsf64cxwNsTXS1gbNHIpsYTltpuhXYqZ2xJzsypv7 d/yw== 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=fm3; t= 1682468197; x=1682554597; bh=CqssG/KC+YvF49hzLtSeRQGnmHXkLm9FnGP zRc0yuiY=; b=Wbl0Dytlkd0lKjIbe6t9AchnDCRQkS7/w/d126/UMletBGaSAzt P9YBZwNZ42PsVn95SD1VGUvIL66ba3WF3OC7wJh97VjuLaa/RJ4qyAQ4+BWzYsU3 DhSsfRjwCWUShC87Nv+JpoidaJsT/FUaLS+ZA5ddsDTMiq4o9vAxrQY4WDDOEjWK FqmGcNHvDJIx1OpOGVdDcyNd5dFNLcXJd1zj2hzd17m73XHk0n64VVVf3vZFL4me GClUDumJE3p8wmRaq6hnpe70ExpOjfftXII0K3x9uLqypKhZsY5UGO3zcWF3puyG Cm5xmTiA8YXeBkSVq4rGHgk5TcemmZJhBXg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfedufedgfeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefufffkofgjfhggtgfgsehtkeertdertdejnecuhfhrohhmpeforghr vghkucforghrtgiihihkohifshhkihdqifpkrhgvtghkihcuoehmrghrmhgrrhgvkhesih hnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhmqeenucggtffrrghtthgvrhhnpefg ueduhefgvdefheehudejheefudevueeghfekhfehleegveduteeuiedugffgffenucevlh hushhtvghrufhiiigvpedunecurfgrrhgrmhepmhgrihhlfhhrohhmpehmrghrmhgrrhgv khesihhnvhhishhisghlvghthhhinhhgshhlrggsrdgtohhm X-ME-Proxy: Feedback-ID: i1568416f:Fastmail From: =?utf-8?q?Marek_Marczykowski-G=C3=B3recki?= To: xen-devel@lists.xenproject.org Cc: Stefano Stabellini , =?utf-8?q?Marek_Marczykowsk?= =?utf-8?q?i-G=C3=B3recki?= , Doug Goldstein Subject: [PATCH v2 4/6] automation: wait for the login prompt as test end marker Date: Wed, 26 Apr 2023 02:16:14 +0200 Message-Id: <7a0e3b0f6373ce9ad0bf66ddb1535ca9c4fed0fc.1682468126.git-series.marmarek@invisiblethingslab.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 The login prompt is printed after all the startup (test) scripts, wait for that instead of "passed" marker. And only then check if test passed. Before this patch there was a race: "passed" marker could be already printed, but the final check would fail because login prompt wasn't there yet. Also, modify etc/issue in domU rootfs to avoid confusing the one from domU with the dom0's one. Use the dom0 one as test end marker. Signed-off-by: Marek Marczykowski-Górecki Acked-by: Stefano Stabellini --- changes in v2: - differentiate dom0 and domU welcome message --- 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 916dbaae59c3..6c0309704661 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -66,6 +66,7 @@ ${domU_check} /bin/sh" > 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 cd .. rm -rf rootfs @@ -159,7 +160,7 @@ if [ -n "$wait_and_wakeup" ]; then ssh $CONTROLLER wake fi -until grep "$passed" smoke.serial || [ $timeout -le 0 ]; do +until grep "^Welcome to Alpine Linux" smoke.serial || [ $timeout -le 0 ]; do sleep 1; : $((--timeout)) done