From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7165928186532855808 X-Received: by 2002:a05:6402:13cb:b0:463:4dd8:d6ea with SMTP id a11-20020a05640213cb00b004634dd8d6eamr12262508edx.426.1668447684288; Mon, 14 Nov 2022 09:41:24 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:c192:b0:780:4a14:d3c7 with SMTP id g18-20020a170906c19200b007804a14d3c7ls6531373ejz.0.-pod-prod-gmail; Mon, 14 Nov 2022 09:41:23 -0800 (PST) X-Google-Smtp-Source: AA0mqf7biYVahWXRpP3HSTqyxX1vj0Iy2BDe+HW+8TowYxzUHXCO2Rrp6sPZKB3tqBW6xHCGMK0X X-Received: by 2002:a17:906:339b:b0:78d:3862:4488 with SMTP id v27-20020a170906339b00b0078d38624488mr10519167eja.683.1668447683198; Mon, 14 Nov 2022 09:41:23 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668447683; cv=pass; d=google.com; s=arc-20160816; b=TZVMBgFlqQ9hbJSuleeslasXnIP4W4C4PmJcUSCUWsOhlJSgtala4wobvGhl0ythEv X8HwNoHa8vp+Vlb1VsayOE3qIWDVknnXGyv25bg8Ku5+ylzj5O+QqZNEhOVkKM6kVEQi wrlvDpwiZ5l1k5HjT7Dlz690/Z4QWrnzPcxYVKAoUVZ1fIOzkQ7MQIHvcdud516mOSLu gJsLvwB/6jGINJZfqO8XUHTsgCptp6BqQr6XqG8TJFoiQv566incpllkOkwnuvryVcvz JH8hbvy20Jv+kqUJMd8Cip/mGOdoZXDEjRn/xj5S9M0hbjNloGqTb1O0PsypgDQMR4KE zfjA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=b69tZehCgoVLJDwSqY1wtoEgFzi2ei8ryKy5lofwGH0=; b=li0uBptvs08APTclTF/AyCT4HgokwymSc8OTRFNLxofjH/vGqmHINdq3Wyl2eZ8jJt caJN1qfvteqfZAyT7LlyKL338LxTcVqQoNBN3SZPxxk2wO8xh42vPhXAWlEl3Sa2zQc6 6kY+T3UwdIuiKNVsdvlIWzqC5rawCJWfRxKuK57gxYPCyK1kVTIGVRfpJQob+lS44SXq UbULKrw0COzIEbgxAigmHFqLxMpWyaGi5+FC2mgApEFgOdCpowtEH2i2/drOe9OYhfVr L/Nk2651znrBuFOknQpCq4wIVLIWJsuKmsaH5birMSi9iRjnN4cgRCqT+sziBYjAUK9L 4c2g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=A1Cryxot; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7d00::61e as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2061e.outbound.protection.outlook.com. [2a01:111:f400:7d00::61e]) by gmr-mx.google.com with ESMTPS id t24-20020aa7db18000000b00461ad0b1dc0si311557eds.3.2022.11.14.09.41.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Nov 2022 09:41:23 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7d00::61e as permitted sender) client-ip=2a01:111:f400:7d00::61e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=A1Cryxot; arc=pass (i=1 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:7d00::61e as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aIDLu+R2j1v0sK1u8QFFBB4bZx59HR7Q6pCJo/WUrtLpT79bdM4Mi4zXrntYDQJWjUMfLT95SPAoHnI71w2m6rxIuIM7GKYq+QmGtsgLvoFx+C2GVsF5jcfatdI1CN+EguTrd6KD+7rRK/k4W7WQSEVkbwiMasG5nyEVkleSML4Cjh4jQX5vsCr9v42CNSkP0y6AFp7uCF4DFjm8wWKiz3O2GAeRrOELe/6bC0L+BJxhu9v5ZTD05ed+ZyUsYEjP60L5O4XdCKvJ1s6RuUYk3C6ee7oIPCh4c08ler9A85hJJByK3ll2OlJ0SemHv31CKmtgos3TmOzBj4kVL9kmFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=b69tZehCgoVLJDwSqY1wtoEgFzi2ei8ryKy5lofwGH0=; b=oWnzRldodbjZxeZRqSeLqITFS5tHdrhhrtupulylDNZXfaMluM9Vv39HRFUiD8gKwQzPu06pBG9dI1igC0YKd48/sgKDRqYld2Ox7f1BPd6mzBdsEW3eDRRwlileLprhpy2oYin/OOjQ4xLNKU8KHH8viRdtTarFmFP/d8npIIU/cVPaYvhDIfs32qs7PtdkLRzHE5NilChhDho6HkuDYMexW0MQLeRAN88dBOfy6rAxxG2v4mH/9wp20b7V/gFS7THf8L9tilKIwnuAxC24TI7a0f1/oLDyBoSkuiZ1RavmB0EmiNmWNystNmy39noGxacK+Y/cMn0QmU/LtsKzxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.76) smtp.rcpttodomain=googlegroups.com smtp.mailfrom=siemens.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=siemens.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=b69tZehCgoVLJDwSqY1wtoEgFzi2ei8ryKy5lofwGH0=; b=A1CryxotjvNkcMVqgMKz7HoviakCIXHnkSIEP1OkXRmPYUdqUuVT9ypN0kGdo2xWC0hLR5mzmxtI6ahtHX6Boot8TODjjQTj7Fk9TTFORVwMSjrBb0Acrnd1RiYHpdlFBOSbmaiK8vMMApfFYzRBoPc5vJ973rjFxh5XK/PXt0d0zS7okIL7NmUxLbrnjxoiORcBGTY16sdADajk9n2t5QE18sAS371GVyhqclR9qo5gF1UiRgfIW07olqMhqiU9ro0dhe5xaHrOvxpaOe9sV4+P2gnRbw30cxBRV3ZooE1McP1po5UAAxV35dtNTpcGwyWvyfsdJb7SSdnY3r4QeQ== Received: from OL1P279CA0009.NORP279.PROD.OUTLOOK.COM (2603:10a6:e10:12::14) by DB8PR10MB3596.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:134::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.17; Mon, 14 Nov 2022 17:41:21 +0000 Received: from HE1EUR01FT103.eop-EUR01.prod.protection.outlook.com (2603:10a6:e10:12:cafe::36) by OL1P279CA0009.outlook.office365.com (2603:10a6:e10:12::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26 via Frontend Transport; Mon, 14 Nov 2022 17:41:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.76) smtp.mailfrom=siemens.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=siemens.com; Received-SPF: Pass (protection.outlook.com: domain of siemens.com designates 194.138.21.76 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.76; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.76) by HE1EUR01FT103.mail.protection.outlook.com (10.152.1.45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12 via Frontend Transport; Mon, 14 Nov 2022 17:41:21 +0000 Received: from DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) by DEMCHDC8VSA.ad011.siemens.net (194.138.21.76) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Mon, 14 Nov 2022 18:41:19 +0100 Received: from md1za8fc.ad001.siemens.net (139.25.68.172) by DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.15; Mon, 14 Nov 2022 18:41:19 +0100 From: Henning Schild To: CC: Uladzimir Bely , Henning Schild Subject: [PATCH v2 4/4] CI: expect a message about filesystem resize vom expand script Date: Mon, 14 Nov 2022 18:40:53 +0100 Message-ID: <20221114174053.13258-5-henning.schild@siemens.com> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221114174053.13258-1-henning.schild@siemens.com> References: <20221114174053.13258-1-henning.schild@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Return-Path: henning.schild@siemens.com X-Originating-IP: [139.25.68.172] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1EUR01FT103:EE_|DB8PR10MB3596:EE_ X-MS-Office365-Filtering-Correlation-Id: f9a3956f-9943-4397-4dfa-08dac6677178 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NWBegxCLUo1MwXPXeQWb6uh+uonkGWEfVH6dyuBGLukXAENh/Q3iWchK9DlMxSzkSs+0J/MdJSIgKFQclu5DqejF6QwM72mQOESnAbHiNMDmGNBkRmqS4HINheVE8vOracJ6jVNLxr5AQBNRYjfFtANZM88zOJi7RJDSLjGDntaqSoJXo/Cd7wTtE2Sw3vKRvycvLbHFZ9xri/5/XOYVg7fpXdem80wx4zkwcsyGQ/pYUJP/ZWu74s/Z0pvTLUl3bRkF22VxF5cJIb0dzEfuTwNeSoZw+oe/P6qYMM01dO/8l0znvy7M8AkMSpE1bHE7NK50v2j5EDCtmgsPJ7eBDqekyhZEPVT9U4koqtNGcOMajiHNluqUwaXfgDgsctKOKP2hsurIpFej/zDpBDPkz2Ozld4IxKfQT4QCwhzjQYo0Y2M+LH2VxON8qszivP4NuJYplP7P8l8zRQ3kAup4OH+ghYLnh79lFZzQzDJ6YdaSOBxGbfLPyBROKUm8b0FM4RxLEC8hYDHEpgRUVFdCR2cPIABEGs+5JeEQZU3mHwPQHUaI+TM0Pr0wXWR7uUrLuSB3Ogh8Cu3yTM9QfVT9JGMEIiD+9dMtTVpd+V6vn/tYazFc7qlpJ3XQ7m6+ZsKuy96zA/HDS3UMuTfEDUURs5VyC9G6Bx/MXDlnu1/mSNESBGgNaeDtJwHdqTcA7ilNo3qgcyNvOlvVFuzHrCUY2Fsh/d1OXvCKy4eQMUtBw1w8Yr+ODd43rQMhzsRZJCretP9briY5gKyd5BzXHzpMA/OouZVex+xrbjNf8qvpbXXBVy49Pzn5HeuHTRYyKpMd X-Forefront-Antispam-Report: CIP:194.138.21.76;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(39860400002)(346002)(376002)(396003)(451199015)(46966006)(36840700001)(40470700004)(2616005)(26005)(8676002)(36756003)(336012)(70206006)(4326008)(70586007)(956004)(186003)(8936002)(16526019)(1076003)(5660300002)(41300700001)(316002)(44832011)(82960400001)(82740400003)(40480700001)(86362001)(36860700001)(40460700003)(81166007)(83380400001)(82310400005)(15650500001)(47076005)(2906002)(6666004)(478600001)(107886003)(6916009)(356005)(54906003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Nov 2022 17:41:21.2934 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f9a3956f-9943-4397-4dfa-08dac6677178 X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=38ae3bcd-9579-4fd4-adda-b42e1495d55a;Ip=[194.138.21.76];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: HE1EUR01FT103.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3596 X-TUID: s909KWJBEi0d 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 | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 07a9edc56d9c..ec44b5756b15 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -231,6 +231,18 @@ class CIBuilder(Test): login_prompt = b'isar login:' # the printk of recipes-kernel/example-module module_output = b'Just an example' + # output we see when expand-on-first-boot runs on ext4 + resize_output = b'resized filesystem to' + expecting_resize = False + + bb_output = get_bitbake_env(arch, distro).decode() + wks_file = get_bitbake_var(bb_output, 'WKS_FILE') + if wks_file and "sdimage-efi" in wks_file: + bbdistro = 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: + expecting_resize = True timeout = time.time() + int(time_to_wait) @@ -265,8 +277,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 expecting_resize: + if resize_output in data: + return + else: + return + app_log.error(data.decode(errors='replace')) self.fail('Log ' + output_file) -- 2.37.4