From patchwork Tue Dec 13 10:15:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2295 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 13 Dec 2022 11:15:20 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f61.google.com (mail-lf1-f61.google.com [209.85.167.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2BDAFJfp000524 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 13 Dec 2022 11:15:19 +0100 Received: by mail-lf1-f61.google.com with SMTP id u13-20020a056512128d00b004b53d7241f6sf965835lfs.4; Tue, 13 Dec 2022 02:15:19 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1670926514; cv=pass; d=google.com; s=arc-20160816; b=OAe7wv4MWiR8d6Q9ntCccVFqDoArZJLoG6+t/69Uo4eE1t1205YKe+bCefYjCfcfSL 7ZKk97E/o+hwu7aNy9Ur2ilpFWOLjtW9yqA+AFVkJBsKOJWfh1IuXohUIs85OD3bk/4H hBrtUoIJ5ddFIN5qJ0gvLbpIrBGeiwnvf+GuTKDkJUw+mY8kj8osvSGUtnGxcy0ldfQe R9dzYlfqn4tBOPBB2iZnJhm0h6bRPVt3Eiez+5WMwB9OS/dTsVY7E5UnTaYtVUwThDsS I+pT3nOoujHtZTUv9V2Mk1iNmOaTIywBlfi2IKrhZ2V5Qenl3l21pYlj+PFR2JU6qnui 9rQA== 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=gjY2Mh5Y0XXQK/VYq79g67COxpip2uPG1is3m0VsCOY=; b=kW0WqvqjOwLTNyH2PGo6tXPpc4IZd715iHYuVV7nLohRLBzHJ4MsqjDTfGFQ/GCEbu yA9R3cqN/Pz8J6MHNJYrV3o2GpZ0rakY8e/a95U1jNHdyF49vVey/4sWA6o8QqZDisXt XRpmKdkMm/+0dIR8f/eAMdHfHtXfQ2KQsStpo+40OIucDN9j/bXN/R1HGBgT8WCnV1Lc LWkVJhabOsVE7BQERTeRGp8By7rU+OxKtuRLuSQoUsxXzl3VFGptqOnOpaMvFIx0T3oe OSAlVNRngyoQMYXM+RDGQ+/SuDxxSMvZHhLmu/t5T4qU2x/WyR8Iq7E6kA668fvnpjr0 KEsg== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RJd2vK+0; spf=pass (google.com: domain of fm-52304-202212131015126b8d0834417422ce9a-p4se2a@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-202212131015126b8d0834417422ce9a-p4sE2A@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=gjY2Mh5Y0XXQK/VYq79g67COxpip2uPG1is3m0VsCOY=; b=P+DaNkW2Xm5oZayGgSYfG4pT/7iqL7CxxQAZUrLnPMUPPTMwNQvWwsKYmlj+MhBuLX Fb8CLE8aUfrokWo7BUHE3zKhOyvMlTpQJk4jYMW/H6988AS0Wv39rtmu2jRzlctvmET1 pRlXvAqkzp3Kn74RtHJDY2os3MaylaEszNHzbvIpbSyvMDODJ77ODw7mzkqzfxkps8Uw +YFmCOT0bxyGkWmI+uypJIGSQHMqiawPeOKOrM1bA9ECdhiODBY/o+UxWr6U0Lsdyu+T VSdgLINMRmA7fNerJXlnn6jbgQ32QBqzb4mpiH25Bdm7/OkCa4RzEQ0WR3Db3mSHMDx/ y9Sg== 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=gjY2Mh5Y0XXQK/VYq79g67COxpip2uPG1is3m0VsCOY=; b=jjG9eK67JQILN8XP1y3yvnCGTnDAd52p9vfWyeLU3ibyKF4CutQmMXFmbyLGaKMFe3 k8W8Gh9Dbzxq+ue+DdOLOowvPSEdJKpocFujwTi0RYV6eCFx/veEqj4tWuL5KKjhSNN6 gfzz0P6tSzJvkeGNzxvTpgO3Wh2XanlSlfxy0g8hJVB0sRujfJ9xCQsw/Q+1uaQbTy8t NT2GHozNC28nZSPDLsy93Fs8hRmidPjd+/vuOLSIyWgpv+9snmuxvkEKPDNUF5Wd+9av 1Mp169wlZTa2/Xgu+ZvCMVR5PTT3wda8Z36IkByVrI8/+7Ocw83eDZz+InzAIyZEQqKt Rniw== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pm/u6R6TO41af7fpyFVRr9m/nFh/2B/tx9eOC5JgqyPfkk/7gp4 HS3UmYu0Xfc6PZ0ozyLkPgY= X-Google-Smtp-Source: AA0mqf6jVyl2rIi/GXGgnrtWrqBGn9OV6VKeKpF8kY0OiGFcaF43XxnMUKkVSlyXXJEIyxH9K6oBvg== X-Received: by 2002:a05:6512:3992:b0:4ae:5dc5:82c5 with SMTP id j18-20020a056512399200b004ae5dc582c5mr37589183lfu.2.1670926514046; Tue, 13 Dec 2022 02:15:14 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:208e:b0:48b:2227:7787 with SMTP id t14-20020a056512208e00b0048b22277787ls2302546lfr.3.-pod-prod-gmail; Tue, 13 Dec 2022 02:15:13 -0800 (PST) X-Received: by 2002:a19:7613:0:b0:4b5:a206:30ee with SMTP id c19-20020a197613000000b004b5a20630eemr5269968lff.65.1670926512953; Tue, 13 Dec 2022 02:15:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670926512; cv=none; d=google.com; s=arc-20160816; b=S4Pp5SXZx6csjYriip4hrzlKmC2Q99t/TKuVdh73tNzKaRdDShon2H1xrd91TGejD0 mGhYroWKhwo+5mXMqXYEJG2BVAgvVzzi/Uk92h0Gc1q0jOhj7BrblPPxqe4U9r4JZa2a vGv35nNriO6sbnKIRM6AgZdRebRDJT5ukmuTzf8o+EoT9m2bBAVP7rSParB7bF7jD82+ 4/F/u/Tu7oZsNSJylTQciYme7eDYMIfPew3tFKQ/J2ZbRhC0SXgKo6zf0ZWa+OnHgGb7 wJ2zrj3m2HmoJbHKEb/acs6xE7eFzkZa+IPQr9oDe33ybCs+fdvoyuovYbwwNYY7cBlW LnKQ== 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=u3wUAf+a8L4p6qZpbbOMZ5T3PM18YI+Kl6uf6S/18GDj/sRKuecTZuyHpPOV6HCQ6E zjV4V1tUQFYAJdfYIh2cs8vCFOBQF+GJExe0DtD6gckBgiNtts6S/eJ2D6HRHnCOzq2F O3SOovMHyaLf2MG5w2vGZEzT0mEHnVPSbQkj9sVQ2tEgPmSqYwNQ06MO1ifOoDGBzrpQ ArrrEkpiICDy86yEobo6nHVAUW4dKTUYkxECrRP5L5te2LnVrB/pSltAaOjSE8SZuRii pny7OExO2+N5wuU90nRERGIhA6ID2EkdL5e0FFL/VxW+0Cj+zxdGNH/qN23+zd9pwiM/ VCfA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=RJd2vK+0; spf=pass (google.com: domain of fm-52304-202212131015126b8d0834417422ce9a-p4se2a@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-202212131015126b8d0834417422ce9a-p4sE2A@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 v27-20020a05651203bb00b004b4f4360405si118578lfp.12.2022.12.13.02.15.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Dec 2022 02:15:12 -0800 (PST) Received-SPF: pass (google.com: domain of fm-52304-202212131015126b8d0834417422ce9a-p4se2a@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 202212131015126b8d0834417422ce9a for ; Tue, 13 Dec 2022 11:15:12 +0100 From: henning.schild@siemens.com To: isar-users@googlegroups.com Cc: felix.moessbauer@siemens.com, "Roberto A . Foglietta" , Joe MacDonald , Henning Schild Subject: [PATCH v4 5/5] CI: expect a message about filesystem resize vom expand script Date: Tue, 13 Dec 2022 11:15:09 +0100 Message-Id: <20221213101509.535-6-henning.schild@siemens.com> In-Reply-To: <20221213101509.535-1-henning.schild@siemens.com> References: <20221213101509.535-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=RJd2vK+0; spf=pass (google.com: domain of fm-52304-202212131015126b8d0834417422ce9a-p4se2a@rts-flowmailer.siemens.com designates 185.136.64.225 as permitted sender) smtp.mailfrom=fm-52304-202212131015126b8d0834417422ce9a-p4sE2A@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)