From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7176574728906211328 X-Received: by 2002:a5d:654a:0:b0:242:7a0:bad3 with SMTP id z10-20020a5d654a000000b0024207a0bad3mr37060315wrv.298.1671142576529; Thu, 15 Dec 2022 14:16:16 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c444:0:b0:3d2:2f88:9ec7 with SMTP id l4-20020a7bc444000000b003d22f889ec7ls256287wmi.3.-pod-control-gmail; Thu, 15 Dec 2022 14:16:15 -0800 (PST) X-Google-Smtp-Source: AA0mqf6BoHD7tepr4ev/HGhWxr5MBbkvafQLnpMBEe2V7KTIBUvH6aomUYH2wOTEXCkyYysm6/Bq X-Received: by 2002:a05:600c:4fd0:b0:3d1:c0a1:4804 with SMTP id o16-20020a05600c4fd000b003d1c0a14804mr23803226wmq.17.1671142575662; Thu, 15 Dec 2022 14:16:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671142575; cv=none; d=google.com; s=arc-20160816; b=0yi/xr4UWl08DHa5w1fd9MzFQlvyjpckoRp9EAkNySuu8EBgHeU6H90Am4UKTlr9gt nnT7HGEuqRQvAxySBw89fUeY4aB7JkB1zXWrLCuSovxjcyYTjUNDF30+/1uWuUtpCuUO e5OAqYFC5hfyc0umX6sfTeKcpwGl0plWX1rWvZtvF6oX52K/VhzZB0snfwayLIVz8MO3 H5oac/MoJCnrZBPh9kU+7JLt3inOdlhmtDrsP8balzkq5vbvEOtCorZqVaPzBWQ5fvOQ UH3kdxSfqj3rwRNEK7HePUN55MGLCD+D5YftH7LPkWkIa36CFGPM3mJ/cCVCAWy/aWVL SVjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=D6BDndyF5qufOp2Kzdmq4jgoiZ8/AwmxFK3p7a2HFFw=; b=qp3YGu+5wUC9NlwhSi6EMmovwnm11tNyNKUJngm2ZoQ2+8A6j9t2fjF/eSfLw4CABB To4RXaciC4BfFbRpEN723w/y7jmRgehCTo1A48PO7Xv8EsHpnJ9R/hCctA+0gp+tzzA5 Z/wW8togxb2qQ2bUDcI+yylv7JW5tE1yk8w2lWgAh/W9tWn9x4LmyDEHwY2MI5CN0pkG KD3GHZW1NVmtqUdH0DgkcyUhcSuya0ZYx9oTOUSf+WZz6Nem1p/ya4dJxcGVcvqnKzgW 4/zQBOYXaAuj9BUsWVa8Wi21E8OZ4nYYc1b5v5fXuTmvUUG3BFDVmwDhiMlLE/yUhEIT Jogw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CevMxgnp; spf=pass (google.com: domain of fm-52304-202212152216153e5e56d1f509eb0a52-eqksqh@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-202212152216153e5e56d1f509eb0a52-EqksqH@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id m65-20020a1ca344000000b003d1d8d3577dsi541944wme.2.2022.12.15.14.16.15 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 14:16:15 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202212152216153e5e56d1f509eb0a52-eqksqh@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=CevMxgnp; spf=pass (google.com: domain of fm-52304-202212152216153e5e56d1f509eb0a52-eqksqh@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-52304-202212152216153e5e56d1f509eb0a52-EqksqH@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202212152216153e5e56d1f509eb0a52 for ; Thu, 15 Dec 2022 23:16:15 +0100 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=henning.schild@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=D6BDndyF5qufOp2Kzdmq4jgoiZ8/AwmxFK3p7a2HFFw=; b=CevMxgnpcdrVoUGeZvM/GY28zT3bW+AOnWmgKtwd2+KwzKiGNRhrzi0vS5LP/ib/KbH+dq 61E5ChP1SijfRdyhU7Gt3/jhgSHlxVbuZI/JjVuzELQcPI/2B+KDD+9UP1UxmhRe5moUChft MGkPF7oEBRcx92bvKCvQFbmCaDLls=; From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v6 6/6] CI: expect a message about filesystem resize vom expand script Date: Thu, 15 Dec 2022 23:16:06 +0100 Message-Id: <20221215221606.5623-7-henning.schild@siemens.com> In-Reply-To: <20221215221606.5623-1-henning.schild@siemens.com> References: <20221215221606.5623-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-TUID: KSjfHxBc90rf From: Henning Schild We have added the expand-on-first-boot recipe and some space to grow to our example images. So now any image using wic should "expand" on its first boot. And the kernel actually leaves a message for us to read, at least on debian but not on ubuntu. Signed-off-by: Henning Schild --- testsuite/cibuilder.py | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 07a9edc56d9c..8b67815442a8 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -231,6 +231,20 @@ class CIBuilder(Test): login_prompt = b'isar login:' # the printk of recipes-kernel/example-module module_output = b'Just an example' + resize_output = None + + bb_output = start_vm.get_bitbake_env(arch, distro).decode() + wks_file = start_vm.get_bitbake_var(bb_output, 'WKS_FILE') + if wks_file: + bbdistro = start_vm.get_bitbake_var(bb_output, 'DISTRO') + # ubuntu is less verbose so we do not see the message + # /etc/sysctl.d/10-console-messages.conf + if bbdistro and "ubuntu" not in bbdistro: + if "sdimage-efi-sd" in wks_file: + # output we see when expand-on-first-boot runs on ext4 + resize_output = b'resized filesystem to' + if "sdimage-efi-btrfs" in wks_file: + resize_output = b': resize device ' timeout = time.time() + int(time_to_wait) @@ -265,8 +279,11 @@ class CIBuilder(Test): with open(output_file, "rb") as f1: data = f1.read() if module_output in data and login_prompt in data: - return - else: - app_log.error(data.decode(errors='replace')) + if resize_output: + if resize_output in data: + return + else: + return + app_log.error(data.decode(errors='replace')) self.fail('Log ' + output_file) -- 2.37.4