From patchwork Thu Dec 15 14:27:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2322 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Thu, 15 Dec 2022 15:28:11 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ed1-f63.google.com (mail-ed1-f63.google.com [209.85.208.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFESAmS011753 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 15:28:11 +0100 Received: by mail-ed1-f63.google.com with SMTP id w15-20020a05640234cf00b0046d32d7b153sf11773261edc.0; Thu, 15 Dec 2022 06:28:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671114485; cv=pass; d=google.com; s=arc-20160816; b=Bi06unRomhr4CTe4Sz+dA7uMy71EH1F+p3ltPERsIaeP63xq8ZOiCn+omoa+sWXLCU dbjSdC1Lbra+7jFsGlNMFZA0LKuGQyoVN/g7o7DNkUCk6zdJBKxdU4Ew7G1uOq9VUXOx I1iOklILwuXhlOwJux7dJ9QnRDRbIkE8OrKE0MfyXeHQ9/ZO4rh34X8lz/K6/o589gtm ymEDZTWQUqBB/OmXZ7IMzWFaRuGcbAH1ZQKBvfqbPs3HWLi5o58uDi5hIZa8mI8O3Nz6 wRDHysYW7fhecBWLZr9iJgCxgWSG1S32Xnbl9wh45oobKpsipe3Jw9xXMVIBHR1ZEyJt cRDA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:feedback-id:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:sender :dkim-signature; bh=vvbQU+rJkWCfZLVImaHRs7uJojSCpNPC0uUlP7pscxM=; b=vpzWBFRq0ubQVudS8mALFAO/V6TnNBk5eqFx7HLehsouH9HGZvQj0knWDTispmS0lM 5TKmHCvv/H+1hjwnaWbKGSnkdRXKhpUAS/tY8Ut+S3A7Mnh359lhGowcZA/KDRuBkBQ/ 3sGJVUxV0vUUu0un/kW4oaaaHJ4zQIvVLJW1fAkbbUwMWUv/3qdMl7z4saIaO1r0q642 Vhmm4sWgY48TjRq74t5mRlnHQHMt4COakV+Gqmqi9/0wKKkTS2fcMsiFi8jHoXdg5hbm B0Zg4Hr5Lr8L0rbQiZYGj3i+R6b+9X7lMeumnpthjrOrzKmve9DYwYrw3/jTszVafoVA S74A== ARC-Authentication-Results: i=2; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:feedback-id:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=vvbQU+rJkWCfZLVImaHRs7uJojSCpNPC0uUlP7pscxM=; b=MUT7csnxMYU6LjwiFs5IT+rGlxxLhkaEtT5Z9H0K12P04jB4b4iibsYKtfQzT58sw5 cUS6p95+yWhpnnSDx6Fjh7URq5mvSMuvboBad2zzZnhr3QirY7vCtMtpShYG+V4eHY64 /+CZlzT/qomWH5J5jCA/oFKPKRjuzCQt0HM6xBnNmsxkXLKlRV6i5mZ4UxMEVZBiqW7p 6P95l20WQ99eJyNwTZCFFPZUrEoW3vt2DLHoc95JB8vFpn2wprNZdrGSO5h+JmxIRFuo YRrHA/a9qMuXtptINGIBnqhJ370TCsQI+lgmqWvgvOnxy9sFctAFVefGLOCv8EvhqHDv jJhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:sender:from:to:cc:subject:date:message-id :reply-to; bh=vvbQU+rJkWCfZLVImaHRs7uJojSCpNPC0uUlP7pscxM=; b=gGirIxcGZSFoNYaRT/kSDGgrNUha2/+k8AfxuULrxSB6nwhTZyBkPTaurici8YMloD eoM0DDS3fT8v+fU8hrTslZPJO1xQVojtJ9ElN2sM3hsOH5dGSpwas7RlQYlvwpMJZmfO Fz5jIepOb+y5fVtWPe+FC7qC89LmLyNpgHgkZCdh2ZO+Z5r1ZjpMjqdxTPHWtPVYnrQf wi05K5xt7GyJzX/fA1psMq4y1m25GsJLDRTikrvdLi2wCEdmD+7thH6ta0OX9Lxs7QVj roEMfTvaL9efehd/7SWcCD8Pc+p2yRxEY2b16zYSTsaCvixt+PL+Ue/kSVTrtcoObHB4 ZJmQ== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5plxMk1NAJc7nY+A4QAaMtwJ8FYyDM4bf7VrGrlcr37o5Kmpx7Q0 iGCcc97Z+2xEpK5UZVzNCDg= X-Google-Smtp-Source: AA0mqf6bLSK8h2RCvwIrq/wfxqUUpWIeNHfnbbKh6v1+tPR8RB4Ijd8241iK+iPR931gBocfN/HElw== X-Received: by 2002:a05:6402:b81:b0:45c:a651:8849 with SMTP id cf1-20020a0564020b8100b0045ca6518849mr18303971edb.209.1671114485759; 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-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 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; Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 20221215142804331cd68970a5203f8a for ; Thu, 15 Dec 2022 15:28:04 +0100 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 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-Original-Sender: henning.schild@siemens.com X-Original-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 Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= 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)