From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7176574728906211328 X-Received: by 2002:a2e:b54f:0:b0:27a:d74:63cb with SMTP id a15-20020a2eb54f000000b0027a0d7463cbmr5280694ljn.473.1670926514118; 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-Google-Smtp-Source: AA0mqf6/k1wsFHXhLR83RltPDaKhZ1NMNjq9i32CG7TUCjRXzG1l58AikNNeylBTdTXSDzup4DpH 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 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 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; 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 Received: by mta-64-225.siemens.flowmailer.net with ESMTPSA id 202212131015126b8d0834417422ce9a for ; Tue, 13 Dec 2022 11:15:12 +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=RJd2vK+0Qep2Pl6Kcvz9ypMy280K32Lg9Fxur10Ug0w0qdYqfkpConxJChVZrBBIWLgR/6 HcwsaEJXKGh7LtNDSF+bUobAS747GDBtrhb6pl94R5xCjlBStl0JU70P+5eWtKua9DjAgQ63 lacNNXQPbvSU1+2BpYoFnkABIzP5E=; 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 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-52304:519-21489:flowmailer X-TUID: rhR+7ptqaHlN 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