From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7165928186532855808 X-Received: by 2002:a05:6512:1521:b0:4a2:2f2f:449b with SMTP id bq33-20020a056512152100b004a22f2f449bmr7535042lfb.235.1668585546203; Tue, 15 Nov 2022 23:59:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:5d5:b0:48b:2227:7787 with SMTP id o21-20020a05651205d500b0048b22277787ls4737923lfo.3.-pod-prod-gmail; Tue, 15 Nov 2022 23:59:05 -0800 (PST) X-Google-Smtp-Source: AA0mqf5X+7B7YuIle4rZLU3r7ATnVlH8J8puNW2zLCb03rmcp+ipjIxzlniYHk0tKtVUalEdmCpy X-Received: by 2002:ac2:4e0d:0:b0:49a:d9ae:3038 with SMTP id e13-20020ac24e0d000000b0049ad9ae3038mr6515645lfr.44.1668585544926; Tue, 15 Nov 2022 23:59:04 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668585544; cv=pass; d=google.com; s=arc-20160816; b=MUPSqbQ30pzNOT+zrDTXANvelSx+mjuY7Wx6KEhkQ7CtaTfOTIAsY14vpRaLx8o4m8 6mhRmjHqOOI5962CZnxl919m/A6REvNngPJmQ4xXbvrbje7kBmMUecGOmKS2p/zs4hIO HeYr/VgV9cCVAeZwapaBc0l/fsUIalXszEKkk6QZg1r/KP9mR+apL5nkuD0E4CUDqSh8 QT9YBlVOX5IVvNMZ/izKJpXtmgFw5O65jYbyleX/mpSgh2bpAL1Kk/JsZlPkW+l0qYhi JQRSkRAWiAwycY0s2bHEUa2DeNhAn050v8EinY1DSlIR+fwVO1vXOJm/3msb8igO5ENc E1GA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:references:in-reply-to :message-id:subject:cc:to:from:date:dkim-signature; bh=4Y4uwdNklfDgrKAYoEwjGktXNqQTIswfwvI6TjcOZq4=; b=VfYIEAEnVnGvVckzYorr4Zws+U2hpHeAEgc8RXy1FqoJf211z16gz/sbJcdF5kRIkW 1Bm4UyWKOGijkaHBWzLH8dmnty3X2zDEtmJo32Uy4tKNT4X6uQdR6ll6ArS1wBdDJJed 7+1/s8E8q7ZBmHAZ+esvF6/r1NyCVLMrH+K6DeIZG7Cgkr8c+G9jg/dkBtFXEsDkl5sb bPnveMyDJNZnouJ74OJDTCyZ6TmfYJc8WeARjZy9+LKE6l7KnQCbDpOwQchukTXEP/B6 vq4GJZkRppU54wzPZsXjCuKYSZ8rwpLLY+9/8Ib2ttguS3HJrwpYdIw8PhmbubBtE8d7 sl6A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=mNL1Thjb; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::620 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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0620.outbound.protection.outlook.com. [2a01:111:f400:fe0d::620]) by gmr-mx.google.com with ESMTPS id h4-20020a2ea484000000b002772c42c043si559612lji.5.2022.11.15.23.59.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Nov 2022 23:59:04 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::620 as permitted sender) client-ip=2a01:111:f400:fe0d::620; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=mNL1Thjb; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of henning.schild@siemens.com designates 2a01:111:f400:fe0d::620 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=RebDEg8dTYkIVoD0K+TZ8OdmoxKH1C3FeTex+71rPiMsbAYYpfb2C020rEgVgHnImOPAfwWDAOpJHSMkOzV24zoz2yrV8gbOotHeWTWRAjtnokAxp2sxmZJwr3ozB/r2Q2v6G83EsllaScFOiXkL0psJy6Gkz3idusPx40+0lZGO28kiTUlH/zvQwCnZMCnrHd9+ZX6O4y6NXY43AJnyp3BDld8aLjoiYhIuXrRVCXsQza1ty4zEUbu1r7JemzyXL2ErUIM/oAn9GcM4NOMuKJNqPwBMKvEce8mYDCYRu3yiX4iJzZ5l2vB1Ctb4SyK/sRCf+3yBwql92yY4xHsVEg== 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=4Y4uwdNklfDgrKAYoEwjGktXNqQTIswfwvI6TjcOZq4=; b=NkOA6cm3Ucf+gsCwbhiGFkOUsbCqmVqUy49AXeDR/1rEPZs2cXyZissomelHMAqEw350jp3TxNLCn9pLlws6ejCJ2vkXtgKOszsCqzoCHQKn+eFgjXXLG9Tq3SyyqkQtc8tBeu6rsZA1q46Hkt/AxRO6KAo+iZIsbrR3plHqDsDZ49llz1wHRiczkJM3LXlZSmCAJV2BgdJwZWJ3Pqkp9SiHlEYSyW6lWMntuJfjS1X1jJkHicieBL1VAEyj6DMSQ6Xh7SOjeFSKiPFMgRv3X1TkGQ5cftoWjYQH6Y7c14x+eCG6DeWlBiqKZKB1sCNkrX2qwmewfYcihf5ec33JKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; 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=4Y4uwdNklfDgrKAYoEwjGktXNqQTIswfwvI6TjcOZq4=; b=mNL1ThjbQqFMf7cbHuMUSP+1ukreWZxp/YctTQkPe1AXEM/Ivq1vSxn8CNeC0TNMU9RQs60/SPXcUsDuCJzHV2Wyjs7LgTsIkbPVVqEMrjcu1rgLgafEeZ6hDt3oDCv86q7vWvPBay1/W8YEnv2FQARZL7C+aqi9JI5ma2B6VYTHtOc2NP38z0vlLBxgrWj1JCz5h0n4FERSGqzXB0JPOUyIUO3eOZoedLwRM1MjkUfmloROlN0DSk9tsUM+Bta2XyAXxP7d97G58yKx31PHyMYW9DovUOGv23zgK3IVpGagjBDQ3MgwTJRDvK6sFPLQLBR/DWSRZj1HxQ4R1R0fxg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) by PAVPR10MB6909.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:328::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.17; Wed, 16 Nov 2022 07:59:04 +0000 Received: from PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::e9f4:4305:f82d:1abb]) by PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM ([fe80::e9f4:4305:f82d:1abb%3]) with mapi id 15.20.5813.018; Wed, 16 Nov 2022 07:59:04 +0000 Date: Wed, 16 Nov 2022 08:58:55 +0100 From: Henning Schild To: Cc: Uladzimir Bely Subject: Re: [PATCH v2 4/4] CI: expect a message about filesystem resize vom expand script Message-ID: <20221116085855.5063fa65@md1za8fc.ad001.siemens.net> In-Reply-To: <20221114174053.13258-5-henning.schild@siemens.com> References: <20221114174053.13258-1-henning.schild@siemens.com> <20221114174053.13258-5-henning.schild@siemens.com> X-Mailer: Claws Mail 4.1.0 (GTK 3.24.34; x86_64-pc-linux-gnu) Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-ClientProxiedBy: CH2PR03CA0025.namprd03.prod.outlook.com (2603:10b6:610:59::35) To PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:269::8) Return-Path: henning.schild@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PA4PR10MB5780:EE_|PAVPR10MB6909:EE_ X-MS-Office365-Filtering-Correlation-Id: 353f3179-ea96-4640-2004-08dac7a86de7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: M6LDOypRdvlsU+0IxyzwOOht93EIFCZoc38KYq7tD00TpMyLzV8mKQEE9RtDrGgNjSbfOvMZ6DgAc/5TGaP51xl5DwGRdTLUh43rQcE2dV43vFqP8+BGSwwR7MjKLrCgiCRDk5jlbR5L+2I4NqVRwW8b4X/ySuGPVyPLkt6uIx9RIFY7yvTVsJ1PCrHs4ZGczamX7HkLgqn8Gjv50RPPbTSju1teg/fn6+AcngqRzeZZui+fhuhe/cfnEYBHSeOOP5sDEKq/V2GtbuLLHtHjB9AAp+asHaT4aaQhWPCff6op8o8ggae7D9psHFgj6IoNWJ/3Ok8MIAxuW1vpa3zCNcxBe8vSRZpeTJXwys3hWAtDaKFXcIm5v0A6Ypi9eVv4vDtmt+Hy8U6bMMhbSE3JAWHXV78GBNO+w5VLh++frDR73muBOxT1IU1P8lNgUy3sta+96MqSilzwiAuEsTRG0PbP3UXK7s7YAZT0EHUV+zEwxGdHuf1zu41SO6nb/zOMnFNnPCkrpZYsYR2AX82umzAFLUTp6ks52HouafWnaUAS9Xpm3PgV9yuzL0y5JrqkdLSA7ap5ITHbTLEDn4Gws9kNTXI5bP2fFDL+KsC7QhWC9qE9tNOC3OPaZnBfYfJDfwjb6L9Q7dSLXVnfmVsWQr4n1HsGx1ui7IFgVIfkbNlJYk8rha6OZrbxgmwA2Wz1zOb0ZdELopw7kofvs7swzg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230022)(4636009)(376002)(396003)(346002)(39860400002)(366004)(136003)(451199015)(478600001)(6486002)(83380400001)(15650500001)(6916009)(2906002)(6506007)(44832011)(6666004)(5660300002)(8936002)(316002)(186003)(1076003)(6512007)(38100700002)(26005)(86362001)(82960400001)(41300700001)(9686003)(4326008)(66946007)(66476007)(66556008)(8676002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?OSTWUK+/XkoU/o8ra754BgVC7091bgr8HM0mDNpaqsxlrxhGw1+c206SCirP?= =?us-ascii?Q?qkbPZlRP7JK5HFHR0vOuT7vOe60uiB51w7bzITvwylgp8AfGzOKqEZkg7U8I?= =?us-ascii?Q?1NJej+WHnw+kZfv2ekg+7KD6nSSzKZDNpy6aEYbuSGtvLw70fIILfry5x8xV?= =?us-ascii?Q?xOxwngP9Ewb0ghj0i4K0jZG+/hde7MOC59Ea+IRugjYNOec1Np6qmfdemIF4?= =?us-ascii?Q?Y+jws3Csq850OayEjR662Ivc1bwYW1Y69YLzmPE3oODnUR4HNDgXEA0dRM0c?= =?us-ascii?Q?08seYw5tUDy/fcEIiyS+2tQ74SQhGsUOvVCjutauPy+V6i9lXVKPgL1aV3tT?= =?us-ascii?Q?rEc0SJaDVPTva1W0xzpDUGGAjfPnIB6KC0ZiX6O+Vc4EaXuk5ISHIP8AbdZt?= =?us-ascii?Q?SAWxJ72iTSDcJQQZAlHUYDBX/6OzQd4/H/vSyACGliRLg3khvwT0fmCc2e2/?= =?us-ascii?Q?LLX08Kewrym+9v1e2g3v5RAgTpwt7r/ejK5PwYHEtyNuIoqiTWZkZgPCaO9a?= =?us-ascii?Q?sIdLgIL1HzwuXtLBut6OZ092g+4DssYXtDrXoe4LFgAVHISkSRchpodGJvEX?= =?us-ascii?Q?CCyeb34FKtjn+W7H5sxAJvJlH6zD85Qt7b8iKEPBzj29qdOyTi8W8NHzpPeg?= =?us-ascii?Q?nfB3iiWK0fY5wsvz9KukftAPudYjfVD+ECa9VOHVoYl7kPFp17ArnEWhK4nm?= =?us-ascii?Q?9K18xPv82FvtpHTfTNCK3HYfaeGpljhJtp2omT4hc3F0X8eRNbM7jesW0yZy?= =?us-ascii?Q?KrU/MUQKY/xQFP4TQWoeQEkdbIR1xv21GaufRc6IMPwsdP4+N447CbzkRMaS?= =?us-ascii?Q?iQmVXukRe1wu0qvsyAwUJvgHIdAOiOEmd16gALvdJhqh6sQz1sJLpiFWLQQk?= =?us-ascii?Q?fV/wH55qMm3lu3aVCJ0T7PHcKUiBEpu7kHjQn3e8zg/goTxXX4hOb72Jw+cs?= =?us-ascii?Q?FNzpam0Qg4aE5kggbO5UgkR4+dIWpcqO1qUAECmcyNtg4sH0O4qMgu51vDNZ?= =?us-ascii?Q?i+e1ZuBNQdaaHSUqzrauqD7FZDHnlVD/VUUAGKMhheUu1FCRvRHdU5mqunKH?= =?us-ascii?Q?+rsHjf/4ALAxBsF5xDu8tNOSRZ39uvoGH2NUgKKEtunUwwvTGFkcCQOgBtBA?= =?us-ascii?Q?2LZObR5tPjYeulvP+3V2vKgCudI2Fh67nVmYYLAxh0+tQ9Ks6mhVK667XQZv?= =?us-ascii?Q?e+WklKZ04gxoYSO4qhK9ofVODhk7yIJ/jQcmj7YRQ+zkJ3xKFmyGRZWjuLgM?= =?us-ascii?Q?mOjwzy/KPgp4eTiuavyEDcE+mv2USI51lDNu5wd8FxgoKSkj2OJas4m+3Kan?= =?us-ascii?Q?uNFLd6xkNVIk027Xpti0qsxZWy/b9I71Lbc0crt9SYwF9IM8pL29z9aAfABf?= =?us-ascii?Q?jKWLTnc+FZNmNuM++FWlCk4x0scF4pUC19gQUZwxl75aKUTn6s6f/8DMiJV5?= =?us-ascii?Q?SuBbeZwFHP6mcmMccEVdiohNDXwiIkOu4OHjg3bU4mqN48d8elLy2l3RhDB/?= =?us-ascii?Q?LBvAvW1JMaUxKxcd99PFghnvCNg1QdkyA4Kup2fML4GM7O8fztimId86BF4K?= =?us-ascii?Q?+Q26YZ/Z/mf0mjNtXS/lk5MFcRsINrBy1YJDtJmNgaPqMMZN2lMlX85PB9Lo?= =?us-ascii?Q?cA=3D=3D?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 353f3179-ea96-4640-2004-08dac7a86de7 X-MS-Exchange-CrossTenant-AuthSource: PA4PR10MB5780.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 07:59:03.9737 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: VYp92nGT134lwsdoUX000NOFVccDNgQ6hbrfqhcKEht8X8/lgoK//gsxFzoI2w5HuivHs9c5rXDCAzvPxdO7qKzbVSFDOkd0oOtdQFbQfa0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR10MB6909 X-TUID: 5z/HFhtwzfLE Am Mon, 14 Nov 2022 18:40:53 +0100 schrieb 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 | 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() the get_bitbake calls need a start_vm. prefix Henning > + 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)