From patchwork Thu Dec 15 22:16:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2333 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 23:16:22 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f64.google.com (mail-wm1-f64.google.com [209.85.128.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BFMGLFM013496 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 15 Dec 2022 23:16:21 +0100 Received: by mail-wm1-f64.google.com with SMTP id c187-20020a1c35c4000000b003cfee3c91cdsf306359wma.6; Thu, 15 Dec 2022 14:16:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671142576; cv=pass; d=google.com; s=arc-20160816; b=r3W1DF6VPSocOoGaoRldIs9Q+qSJgqncffrCChtbZeabbA/rvc+PBsFkt269H6IMuy rVf1QvgPKPd6VpzlhUBe31FswRmeFFcSA2wbwBqosBcqUftGX9gtgPCmQrYkolvxG5Zu wmU9Ui+IfEIXEkADByY9qS+L+u+avZn5mopxocYS/9zKvq+E/h9w1lIgBriqUYKAvSAK 7HHjs1xrPWqiWCQCqIz5J02A4ZM+JGVmKN3IG2YD4kjvTJKETLdi8FzRTBvUIgwfhwu2 YzAfBOsRm0zfCpYVmqk2Ks27wZGcvab5evb/OtF+e1N4QJD9nWcJz8pxfwFFLYZkWT/z nPvg== 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=KwXDRCd6ZMP7/t63DnXlwR4itl6qfZmCI52LGrPn5b0=; b=NxrI6U05F8dKIIZ/t5zMmYj8Cc/0JamQ8KEAABEwfrOQHT3L6hZy2IbFfLfISATaTp 0yLOpt3xBcmyz3PFnLLJuouvQ3Ry+A1bZiNZ9M3mvgDlAjtMy8vTnumihbA1vh7eUYH3 ljGtveFoiqoOEKN3SANUlUDVgesgQnJrQ4HrjZq+6zalm+Dew1/6e7nhTSBrYzAQF4DG 6123uuxA8GcfUvhfV+B+0eGIyTQX/Q1nrlyMxcfW1tYQT2MkiOXLuoC+V/y82KUOtWeQ xwAbrJgFwXrRnhgmYOFUmccz1v7YAmga9V3ALpOFXGl7na36hDXXWyU03gK7HrXNZE1A qm0A== ARC-Authentication-Results: i=2; 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 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=KwXDRCd6ZMP7/t63DnXlwR4itl6qfZmCI52LGrPn5b0=; b=Hh4JZdCXCVLgHM3hB+DlciC6XLO1nqJstzZBDUz5nleYJUr17Pdheqt8k/+mAWaSUm jvM5qqqx2G/NSSv50kCSAbD/C7/Ca1fzl8hHk/B2drzydM7QxLWk0xhA7Y4M2LYQj3Ro ip/JahJOoyijx9o7mZWd+F/GTRXWVTITPeIOUY8JzaV5WskT8N79H/yma++JbmME03cd Za1xfwiBJH/6nP/3sTCHhLr5HKuiKAb0/ke0PlSwoelAs6tKHDv91dFsjU1Y3gHMv/oI ZuZ0oDDwf3AI42/WTNsWKVazwNOWLeCDdL0u9YI5I4WdIpNn7yU1jF4EUIvdRfNI7FeN WuPw== 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=KwXDRCd6ZMP7/t63DnXlwR4itl6qfZmCI52LGrPn5b0=; b=mpI+3IOfUuYdKt5u32WegYtTgmqa0LRVsIn7iFC8qaE6AnXp6leeb1Cf7F+zrya3Au OeiM2H++tC53FhYmkrjplo7Co5vFQBBhL9O/aVDXEk+c5hC+d0gLd3GVINWDyDxmoIh5 D2dPRy0zw+o6Dyx0ymIA+9o17mqCuHEABuEj/Qn8NsFLX86iRpKy+kOD/4RabOfEuP8l VFMOuqMMQCh0IwG+yEEVrIUXpyudol8dUoERK4ZQTZMBsN4gccXBsf5JGdMs5xS1M7Sd dPjUpWUp/0YSw10UYICZJXHV4rnLO6Oco0IKB5ZIdLYVzi23b52H2CPxbs3kfFxwDPf1 icgg== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pkj6RzVzH9zxaPqZdognzC7FKuUDMjqnCN4eD397w6eaccRCl0k Jl63E3b2HqcoxHtVJ3ffcPM= X-Google-Smtp-Source: AA0mqf6CtLT338XNGE8iD3DV1DxUi2RF3lIc51V3af5Qqy6ddvycqvNBCDBxGygYrjvvwrRaUp4J1A== X-Received: by 2002:a05:600c:4e10:b0:3cf:a258:99b with SMTP id b16-20020a05600c4e1000b003cfa258099bmr431768wmq.34.1671142576489; 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-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 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; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 202212152216153e5e56d1f509eb0a52 for ; Thu, 15 Dec 2022 23:16:15 +0100 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 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=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 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)