From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7176574728906211328 X-Received: by 2002:a5d:518f:0:b0:242:3617:315e with SMTP id k15-20020a5d518f000000b002423617315emr243064wrv.451.1671785767428; Fri, 23 Dec 2022 00:56:07 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:3d89:b0:3d1:be63:3b63 with SMTP id bi9-20020a05600c3d8900b003d1be633b63ls3872870wmb.1.-pod-canary-gmail; Fri, 23 Dec 2022 00:56:06 -0800 (PST) X-Google-Smtp-Source: AMrXdXtGZBgZVncsGbNolxl7IhqwnjnplLCftqAFXBPYxObdUhioE9knM6CRj3RX8TLR5GTFmBky X-Received: by 2002:a05:600c:d1:b0:3d3:4d21:704d with SMTP id u17-20020a05600c00d100b003d34d21704dmr6461973wmm.14.1671785766506; Fri, 23 Dec 2022 00:56:06 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1671785766; cv=pass; d=google.com; s=arc-20160816; b=fQTokJlFgkEwKKlD3cf+7usd645+A8OE6DgpSMcVjYLbljuxoW1j8kdq0QIJSsfpLb 6QkLHgHk6DE1sRERSg9TB/L9Kl1rxyU3WEQ4yT542YVpl/VcAeUoBRqHqmeva/2se5V1 pQcG4SsAx1iRpMXa7rY7Rplxej5XHP6wXMc8ZPGq1JlgAojoAwXi2UnPA+i9MCYXBPZr B9aVfhgyL+OHD6M42Js0ncafrQPuFf72Thr6tfXXrddKm1tuFOxRKVGA8Tu7GipSmHaL i6LiX12maa/LmlEwnGLg3Ng4T1hT8r8BdvW47MEeg5s/aaSfKyk8TA/ym5RwFOXOXMoP 1Y8w== 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=CN3btUMTGBkC/QsjGFq2pKnZfh7Dh9TRaHBqW6ouNWU=; b=XNpQ3szNWhyJKXhXwMwofjqBjyCcTth6EHDHdSPgRsXLK3rigRZfg+RgyEvKuEDl8U YtANK2ILaaOItztBT1JOOlQv8QrDnCZ+245cxEkrQ39u6Ts3GIJ/z6BlQAm3QvBzYi6g SKq3woCKIsCq8oqI4al6WLuKW8CWCzVA8pW+DJB0NMCf4n/ldeX+nGOfkO3yvkaelKm9 t/Q++HLPoO/vNyQRkJC6AFXGaUfNDr3BXEottBqL4sMRILkWGEj8NsBENq0nbwc5Dusu pXJt4Dd+M6xjlY3R48k+cNOPofbua2/lkOnQdOpu+kOa0062wTHLxH2s6u+q4Ltxmg1k 5BsA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Qe3hDNa9; 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 40.107.241.86 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 EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2086.outbound.protection.outlook.com. [40.107.241.86]) by gmr-mx.google.com with ESMTPS id z5-20020a1c4c05000000b003cf1536d24dsi187548wmf.0.2022.12.23.00.56.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Dec 2022 00:56:06 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.241.86 as permitted sender) client-ip=40.107.241.86; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=Qe3hDNa9; 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 40.107.241.86 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=lAByX/g+NIWphIYcR55xykGLulEdTq7eFIWeYs4OXC0u3RTu1fApLVTCS1jj7gIKQB93LPggP9fP64YL+kOnnFswlPrEDH28jMZj+LJ0N8nxJWR7aZLPzcBZcAbTzUCbUraGAiZtLcVMMrzNd+vtWCZ6dcWTQpwVT7BybLNC6FGnXVN2jG5IZxzLtfP4Zw5l91FDEr2WBKyFj77qCAMrN6642Q+nZ7lzcvqjUrmtW9mA0/O145t+0NKMjxPkoNbXtYm6F6fTVH2lBpDbxBhZ+EHXuUpNCVl8ELfcgg6IVpO1kocgicmIFIq8f5oKGka/mhRGWhCRO33L2AZx9VHTig== 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=CN3btUMTGBkC/QsjGFq2pKnZfh7Dh9TRaHBqW6ouNWU=; b=Or7TRhtEce1K++SYuosu3ZWa5Q/osU33cH4hEXuIlzcHW8RbqijVb+AzcrzfiaV4jel23y1jYeNZDhJk3fl8XkaJF+vH1hCLFXatF2T8sNIaNWJcWcNFDBJlrgepfFDXAB0jUuGvTylLwzW+a4NF+SGfEErmENHpLk9BcNz5jRuQI95pSm+4qLRMEYqb1ffo4ezMShq1v7d1gvVEUEodygEoSj0pkca5vJS3oGJNAnCwPYk+ticgqQzkAagbEliHF/zMDtVDGSaYJVB2AXl9HpgdUkNPGe3xK2VLro2WlgLLV/Q015P1UUkhGiCv3/GhD1k33d/4iFqra9HpqWmZhA== 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=CN3btUMTGBkC/QsjGFq2pKnZfh7Dh9TRaHBqW6ouNWU=; b=Qe3hDNa9Eu3hgC53tO6yim05TD16XOXi9h7GfigZRN+8W2hutDgvY4XR52cTio1SjDx6MvqwXk2f2juQaUrSY/oLnB8U9EYD6w5gE7duMq+BF4wFzv9CNOE9Zq7KVPloTPaKOzjrRMST0/h4UDRCvFeQg8f1T9nKrmwEKmQ15eOGNH6qc+5KTFMda6KMYwGlo9JXOsMCBi/QoCziTyOty5uUlfWs+8nJJzwLuQmOk2QFUspZtkCervk8R1gOBeZyt5zu0tVd0408RbqSroHq4Ld0fcqb0tLiZV9atk5LOtuVUTt9zeda3pvG8sRmLtBmMCtvTt6tQp8Z0guQUjHeFg== Received: from DUZPR01CA0020.eurprd01.prod.exchangelabs.com (2603:10a6:10:46b::16) by PAWPR10MB6805.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:102:335::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Fri, 23 Dec 2022 08:56:05 +0000 Received: from DB5EUR01FT032.eop-EUR01.prod.protection.outlook.com (2603:10a6:10:46b:cafe::74) by DUZPR01CA0020.outlook.office365.com (2603:10a6:10:46b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.10 via Frontend Transport; Fri, 23 Dec 2022 08:56:05 +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 DB5EUR01FT032.mail.protection.outlook.com (10.152.4.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5944.13 via Frontend Transport; Fri, 23 Dec 2022 08:56:04 +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; Fri, 23 Dec 2022 09:56:04 +0100 Received: from localhost.localdomain (167.87.23.195) 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.20; Fri, 23 Dec 2022 09:56:04 +0100 From: Henning Schild To: CC: Henning Schild Subject: [PATCH v7 6/6] CI: expect a message about filesystem resize vom expand script Date: Fri, 23 Dec 2022 09:55:29 +0100 Message-ID: <20221223085529.8835-7-henning.schild@siemens.com> X-Mailer: git-send-email 2.38.2 In-Reply-To: <20221223085529.8835-1-henning.schild@siemens.com> References: <20221223085529.8835-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: [167.87.23.195] X-ClientProxiedBy: DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) To DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DB5EUR01FT032:EE_|PAWPR10MB6805:EE_ X-MS-Office365-Filtering-Correlation-Id: a4419e68-24f4-454e-47be-08dae4c3865c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7MXh4EZO6o54pS1tU3VtbYT6BIRfzBp26Tj5oEYmW9Oh1+9LWr/aT3LQ/W+0H9AqCmKrL5iMiNv6FXKWCrQEPIFGc5Lc3G600RwhA1Hwi6wHkMtdWVIubVF8BdNHqIlYHPPYxc/Nm/fFnCYEcJuJ0ySgVZsjQfJ2yAKMwhCUrC2Be35uJhWOsRB56ysvlDsYOdj63y8hXC3LJmAKQj48GJknpn1lKoOlmeNs/DI0ozERn3gWh8uoWHiCfYi2z5yjj4z3OwnjNs1noXkfcS3JMp3ihGdzXzv24jGcbr8B8vXOa+jjNqKH/NQrrPdzznsMFSQhZK4W130+kmabHVdGGNesTNLpzkBodo16O1EhyjeoXNPaB1EDhtGuGf69ezhhlUw2+RRjMnc+UV3vtmbPnEa+ysEoItioPmEq/1vfj/Vb1dX2tzf6o0to64d4UJfruQReXqzgBZXjOzhp7z4Jx3rtSQzjxcn7fs4GsyfEC9260Ndf5fKCD/comAXYsC8IvUcaKeGrQzIPMbXmsYgaKnLJN57PDDMpX0+8r0c7ZLWwLGls5ZhwyrSGCJLveHDkfcrdYv44LHwl2FuARL3JCj7abSM93/pb1c5CuMGAQIsLWan8QEYdpO/ozYmzBcDZ2y6aj1GBVNUwzkFQ+6nyq9ECEiZnyE/V8S1GIEZLEXBs3hxe5Wk9Enz4xCZoNPcZlg02z7GzPhJ3ThtzQctlvO1zs9wUCUS0kH+tY0FlB9Q= 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)(39860400002)(396003)(346002)(376002)(136003)(451199015)(36840700001)(40470700004)(46966006)(956004)(336012)(2616005)(316002)(1076003)(16526019)(6916009)(478600001)(81166007)(356005)(40480700001)(40460700003)(36756003)(86362001)(26005)(47076005)(82310400005)(186003)(83380400001)(82960400001)(6666004)(70206006)(5660300002)(8676002)(82740400003)(41300700001)(107886003)(70586007)(36860700001)(8936002)(15650500001)(4326008)(2906002)(44832011)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Dec 2022 08:56:04.9671 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a4419e68-24f4-454e-47be-08dae4c3865c 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: DB5EUR01FT032.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR10MB6805 X-TUID: xjk5Q3p7FcX2 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 | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 07a9edc56d9c..09c6ab9e535f 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -231,6 +231,23 @@ 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() + image_fstypes = start_vm.get_bitbake_var(bb_output, 'IMAGE_FSTYPES') + wks_file = start_vm.get_bitbake_var(bb_output, 'WKS_FILE') + # only the first type will be tested in start_vm.py + if image_fstypes.split()[0] == 'wic': + 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 +282,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.38.2