From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7176574728906211328 X-Received: by 2002:a17:906:2ec7:b0:79b:413b:d64 with SMTP id s7-20020a1709062ec700b0079b413b0d64mr64054838eji.538.1671114485819; Thu, 15 Dec 2022 06:28:05 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:5215:b0:43d:b3c4:cd21 with SMTP id s21-20020a056402521500b0043db3c4cd21ls4795468edd.2.-pod-prod-gmail; Thu, 15 Dec 2022 06:28:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf54YmzikYvQLbXDAQF3CgrpOuH+8wB+A0wNjk9SKOho+6eVX6HI+hCQrZ4D2kX3RqUCXPHD X-Received: by 2002:aa7:ce91:0:b0:46b:67e0:90d0 with SMTP id y17-20020aa7ce91000000b0046b67e090d0mr22981290edv.28.1671114484895; Thu, 15 Dec 2022 06:28:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671114484; cv=none; d=google.com; s=arc-20160816; b=GuMfaOlNYJhZ2iNNBvZJ+pDrA3hv3NyIsrca8+6ehTg/wu8ynmxDF9Gc9oyrbbwWGx SBPfD+zGcuGgHBdFuwFMEk27Mlf3X5Af67UXSoaE8E9lt0yDNdTQ1fbYEuoONTczeANs M0XW0Pp5hHqyv6JJ3JiaRkU2MsGfLUlpwb7Zcdr1lYRuXCoD+IR90NqQMvZXj99s5JvH Obn4B+7H8LiJO0UoEDwDqCxswgHXU3dzR4Rn0he/m5WrSs9RGG7UdFRc+bPoVkguKv6T uehJGu2bY6b5pN1SwVc8Q8ZngbeYBL3leXbe9nH1uXHdjs29zyOQkhtILqxveHrgBDKY jELQ== 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=FJz/OggRURNQwu7OEaRMMvsB88FONJV8AAuhG3ec5OjWm4W21L+MWf+02yK3QBWyxT 47Rh1x6EhiR6vcGDIZfLJykRrMZLWRwR5C5y7Sj13a7smvw4hWYLsAghApmSBMYQgHIz FTw+AYxW0W+XNF2NqweXQRD42nag7BAI0FqvDz9j2bQqnapMJiwUGGx90Sk/WBU/Y/CL YK1avaFhuJDULfxT1kofXBrM2mVoO14WS1D5iIWdB5l793bNivk4TXJ4JgbfoHfNrxGR dPfAslKMVXal4hH9fKn1qOJRZLRHwVNQj5GT75dD3PjH/MeEEBGAMLXzaRrLu4g6oyNr oFcw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QV7dwTzF; spf=pass (google.com: domain of fm-52304-20221215142804331cd68970a5203f8a-k34htq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142804331cd68970a5203f8a-K34hTq@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-225.siemens.flowmailer.net (mta-64-225.siemens.flowmailer.net. [185.136.64.225]) by gmr-mx.google.com with ESMTPS id ba13-20020a0564021acd00b004704657766csi361090edb.1.2022.12.15.06.28.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Dec 2022 06:28:04 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-20221215142804331cd68970a5203f8a-k34htq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) client-ip=185.136.64.225; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=QV7dwTzF; spf=pass (google.com: domain of fm-52304-20221215142804331cd68970a5203f8a-k34htq@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-20221215142804331cd68970a5203f8a-K34hTq@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20221215142804331cd68970a5203f8a for ; Thu, 15 Dec 2022 15:28:04 +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=QV7dwTzFb50+zkj9KW9UO/xdfRRp/uQcMNOxgMuM2MNaOTn7asS+3GqLnvhAUlLNnPjNLu 8hbYg06NQLtdJaOKZJth1kv8ARX5burgDfbnxagJOseqCmbjx7gcGRGexHjvfCPmIZluLjtU z6JyZirfKjQflx04NXQ5u/gPRWAAo=; From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH v5 6/6] CI: expect a message about filesystem resize vom expand script Date: Thu, 15 Dec 2022 15:27:59 +0100 Message-Id: <20221215142759.26327-7-henning.schild@siemens.com> In-Reply-To: <20221215142759.26327-1-henning.schild@siemens.com> References: <20221215142759.26327-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: h/NnbP0trsSZ 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