From patchwork Wed Nov 16 14:36:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2217 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 16 Nov 2022 15:36:36 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f56.google.com (mail-wm1-f56.google.com [209.85.128.56]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2AGEaXJn000314 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Nov 2022 15:36:34 +0100 Received: by mail-wm1-f56.google.com with SMTP id 186-20020a1c02c3000000b003cfab28cbe0sf1244249wmc.9; Wed, 16 Nov 2022 06:36:34 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1668609388; cv=pass; d=google.com; s=arc-20160816; b=uo3F/bQ5/9z+N5Qew6mVxCfAht6BmgI8b0uweQdF6HkTxkDabJkJvhIX68oHhCWf1Z OEHI4afPVAOVx97k604UVPwvtSHrgU0V3eWgEvj0VS1xKNTt3+b5tmwIKboiq/IMaE9z to/kHsSUBcXvP3WSCh2mtLjNb214i62H7g8mvR9HxKa+udJew/rNZLN0hSOttiSimXyA m5iqV5B1Mvkm2NjfeAXjg7YEoShntdAv+WUJ4b8gIIuPGknsJoHRb9nCHUcUIddglFEI HP2R8v5B29cz8V2zItqLdZ7sc1j+CvBLBrIJSll0aWL4tUcptnoo0OTEkQhL5QuUYOps +CTA== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=q1/yU9P5Uy/D5T99QFk7aa3Otf84DbCRTjVzeY1M6B4=; b=KN+eDRBr7iI5TEpYLhbGFt8obN5c0ncUaKxL5+8PqLH+zlKQjV2zM6LmoHTTtYNlOx JqvSvCbRegSc4ogRkHDlfz3U6LUOh2+eh2JEe+3EehekS1nEpu6QodWS43lmCymlKyQO rQ0h89DPijHE6jec9K4mWNG34YojEX4E1m2v2RxCiZalUBeeo1XyhDN3hPZ7JFZiyhnL a/+mThItF2ADa7phZH4cDjPjpdubpLQGYI6SMQQ3jyThVtukboCooDUmKEfBwhtIy8La DeiB4S/b5c/NYjFCKzWxIyOjFLahME05y+2u4J1x2g+fPVadItspaCkP9bNUrf7TjvMo 1QCw== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=PhvZP3Fs; 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.20.47 as permitted sender) smtp.mailfrom=henning.schild@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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=q1/yU9P5Uy/D5T99QFk7aa3Otf84DbCRTjVzeY1M6B4=; b=AEMWZpzEjKhnHFAsVQ9sajUfkh3he+j5W3uu1xICUqprEXHHvzS4ZrNFsOCxJ4v4kr NF6UC8fYiLQGwU1e/252LPWRwErS/EgFzat2F+Y3rOQ0pN5dlE2CYMRJr7VmAzoWlVTQ qbcfQfJQqtXNdccw0FxkHPHwCcQtnT1K2tTerpgmfQrtcBJbOGzgzSQZ+qqvpjBI9vXE VZ5KXeGU4p5FaJbZgyl4eDq8z7x7082+xX3ZRicY/vb1lkj4trltTJIX6bDpF4rrqKvY iW5mPaISJBXVN7rpY6lY07cCEwJjJFO/g9xWHxrtml9W4hvuh3gX+L+AMB/G+31m3N4Y z+7A== 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: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=q1/yU9P5Uy/D5T99QFk7aa3Otf84DbCRTjVzeY1M6B4=; b=Sy7J/Psi+qW1SrcBA/pTfXIrRxarA09QvMT8SQSD//gSTwd4lE50hJjn269hpx/vvw OnbFB1boxn6hYxYSRrxux6pbXHxMk/g+N+TiuVEcfuDuuaqM8GFou8v1RNSROsRTNXc3 w948eMcFmYaeEMJAisphzi92Te9MHwys0mrpdtONp8gsy3kaWf68mHg1eCle2DPTo+tV YEkKnTg7MNog0WcGqDBen9Tms01C14mS79RX2jmLD9p0dWkzfgbj2AyXd7+s5bZOcwUN HpN6JWsp1GMC8Sn5Pimyqf/p46VeAKDvCyPaZeK5x1VCPZ9X1fFJc8HNeV4UMDQgxNUV QrjA== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pmIT5wl96ckszAEr0+R7a/y+MziY0h/BFbdhCcscCDx3Btun7Rz dt6F6fVVe4ANlyLMFJ1nrCc= X-Google-Smtp-Source: AA0mqf4gLEMsPC555hL6o/sjol1C1CCjVo5riSIBXZSWOqL3SD1GysgLrwh7hga4QGW7M8avw5ZdnQ== X-Received: by 2002:a05:600c:4e09:b0:3cf:55bd:4944 with SMTP id b9-20020a05600c4e0900b003cf55bd4944mr2336030wmq.64.1668609388620; Wed, 16 Nov 2022 06:36:28 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6000:222:b0:22c:d34e:768c with SMTP id l2-20020a056000022200b0022cd34e768cls27247545wrz.0.-pod-prod-gmail; Wed, 16 Nov 2022 06:36:27 -0800 (PST) X-Received: by 2002:a5d:4ec4:0:b0:241:6a95:6aa1 with SMTP id s4-20020a5d4ec4000000b002416a956aa1mr14056474wrv.458.1668609387510; Wed, 16 Nov 2022 06:36:27 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668609387; cv=pass; d=google.com; s=arc-20160816; b=NuKz4SKexYC70ddqkXTHizLynV7l6rXDtUGBVho9k+1FeNAWiq3rTuKgkXQlDM6sAG 9WCXJ8KD/K8h3TFyN+aOXzUWtONc+cyTTCHvfV4GtAjkMehRmT4wpHKuFRlpumvBJvIP H2gYUEHWBTvHrJJDh8mn9ANaI4nVLVW77pt4H3LGuAIxkX+n57Uj8oldPLkdJuy736Rm ZaUWR+dpmk3mFF2yLv9nsO24/igQ+spg+R9dv9gzLItLD/hu4ovF+WJf7lj7yTw9l6Fq PNOzEtYtUMSXULv7JNwDpIwq/UBt40uCmd0Y6iaSmgI1rJ7Ve4iOia8s5fiLYQnBtxye EC6w== 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=0Fc+oMN2flltRDlNaygV3QHQ9EdJ8+px4yxLWwoMau0=; b=jIniq2XGPyMLtvIaqC0or2AjlyAoAGOKBUIIc6dVOC0eOMV6fiC2ukzmaKR3l4rbh0 olNYcCmlRPJuyDwLDPACnaJ8FF7245G5kFZ87mhIXkMqodx5OObaocCglJ6+bXHRFXJF 2BUPFE5fwGxmtyd6UEzo/SGR/jPtjs6ONV7TqrdJrRImNSxOLr+Ra+r0EHT1amR9AJx1 jAgKLOey5uUTioNVdVMiH/NnU3ei9fxYVqtdHawbKQz6K2KRch+CC3DKqVXZNoCVWPAU GueP9j94fxtfDRCP84omwJAJ/v/S5UmIDP6Chn1CcBg0ZMtvrWJUFte/1DItX9tqVIRu D82w== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=PhvZP3Fs; 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.20.47 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2047.outbound.protection.outlook.com. [40.107.20.47]) by gmr-mx.google.com with ESMTPS id bk2-20020a0560001d8200b0024165c0a706si506673wrb.1.2022.11.16.06.36.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Nov 2022 06:36:27 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.20.47 as permitted sender) client-ip=40.107.20.47; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NoO0bE837HYuDGZXnOwlN1x8sUPMD4hEHQ0d76ZmcBXYIIWfCZ35qtKTCCPdtA8dWDOawAkutaH0i3z387I+A6smdDpSEYf476dpKuDBMrPISTv5t/Vo8jQlnuPFEwFIGIfd0UpGJA/8SoaqNwSE06lofvGM7R36t6Mo+pjLPpqpS10HpVQxk+je9y5m1NmHjnL9REu3p+SvDTbtKgY+GblJfVgXwU7643gHDq9f2SwnIxT8RXuttmaIS3rQW//GnVdC09elfAGZcIRuB56RSxhVq6roXTCnaBJ2QNvmizT+7M/o62r8cMWxfhVCFrYj9lYEaJQDADhPhhnWsyRy1Q== 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=0Fc+oMN2flltRDlNaygV3QHQ9EdJ8+px4yxLWwoMau0=; b=KGALhVSdieM/jBkIquI0zLQS26k8ic+6yP9oox0c+aO1VXNQnQnhmjyWlsEwvJ5F/mb/JkQ4RC+sK6uL4pD/N6k0Shl0nHHu39KcG/cJmonpUivaYk3RzYT1QG8W0YrQd8M1Qxp4Qlf7Q/B5B9tKrZY+L6nbavqlYkvUCHI3C54eFC6uk5URlIkDOzrQsrsyyqZ0FQqnjrDFipVjEiMjcfWuJDhG/Yr9KV28B+fCj2PooyjLQXS/6ymhgAsMCLYZiFtxpuTjEa77585QagG+/kwctPCIh9/0oS8D7rvphBem9lm/xT1YILrnNC3nAAO6AQLuheNdZVKDeCJAVA65kA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.74) 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 Received: from FR3P281CA0116.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::20) by AS2PR10MB6895.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:5fa::17) 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 14:36:26 +0000 Received: from VE1EUR01FT067.eop-EUR01.prod.protection.outlook.com (2603:10a6:d10:a3:cafe::17) by FR3P281CA0116.outlook.office365.com (2603:10a6:d10:a3::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.8 via Frontend Transport; Wed, 16 Nov 2022 14:36:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.74) 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.74 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.74; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.74) by VE1EUR01FT067.mail.protection.outlook.com (10.152.3.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.8 via Frontend Transport; Wed, 16 Nov 2022 14:36:26 +0000 Received: from DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) by DEMCHDC8VQA.ad011.siemens.net (194.138.21.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Wed, 16 Nov 2022 15:36:24 +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; Wed, 16 Nov 2022 15:36:24 +0100 From: Henning Schild To: CC: Uladzimir Bely , Henning Schild Subject: [PATCH v3 1/3] CI: improve cibuilder readability Date: Wed, 16 Nov 2022 15:36:12 +0100 Message-ID: <20221116143614.24348-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221116143614.24348-1-henning.schild@siemens.com> References: <20221116143614.24348-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.172] 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: VE1EUR01FT067:EE_|AS2PR10MB6895:EE_ X-MS-Office365-Filtering-Correlation-Id: 7540ff8b-de76-4c29-25ae-08dac7dff122 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a43jfW1dG/ap2+0sRMBk6JlSV5y5x2OSX5m+JZi2mkTHGclsgyEgzflMyrf9yXt5Gp9DD+0jKjJ6o+cTS7xwIi2YEGLce9Wua2pGrTrBKNW00kg4+8zIhTYOg1WNhUImX3bwb2DXJ9glnQ72SrO+T5oMeYukI7yQigc1BUALoj1XYTCRSo5+w/DAf5MW9NqM6Hn6HvB5WLjnWG/xSUnxEi1cb9k291iWf5ZM8vDTNKyqWruMbmPSNPwWG5O6HkdwJ3TvrEpbg4MiitODWnTHZrUZFE5zRQQTwRoX9Ol63jO5B7tf0rjxWA9g9Ne04NQvbDqOAlF9FifIRu9iTH+QMcGd2JCjAZ9Vim9bH0sUe2sNSgQwLzhpFAjN/zhaMY8tBPJ+I2hDULNREmB0mN/+DhEGNbXKaMneSejUtayUM5+rCssh2r/YXuKlGqzQJva6rhhqNrxY8L0EtAbcIxx7QJ4ZVflBU++z1hz6zW/lOJOJJsGz1rAWDNJ8uzEazyDOETZOOAVdJkhYLJ5IaOL9qCkF4m0OTuzy/j7YTd8FyZYGGvii73ojbokhmh+LN0nKkqnLYg8gyjvLVOId8EuOvXZ60+2tnipdCSlGu171DANjqYB6wSns/bRHMtJZWptxOKIh1d9cdOdIDfQyG81TKmwEy82X7toUYHwhCf1ArJRfTm/X74ecXH6oZ68TgvZaq1Fr3aD5M1U8kU8uDTX7BCl471Z5SS0s9JKjNd2Wm3Un8FCOVx0b59pDRYRx0Y0CMo63UAC8MQcZfN7ewyJxkw== X-Forefront-Antispam-Report: CIP:194.138.21.74;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230022)(4636009)(136003)(346002)(396003)(39860400002)(376002)(451199015)(36840700001)(46966006)(40470700004)(4326008)(2906002)(26005)(44832011)(8676002)(70206006)(316002)(1076003)(336012)(8936002)(47076005)(5660300002)(70586007)(41300700001)(956004)(36756003)(2616005)(82960400001)(7596003)(356005)(7636003)(82310400005)(86362001)(83380400001)(40460700003)(186003)(82740400003)(36860700001)(107886003)(6666004)(478600001)(16526019)(54906003)(40480700001)(6916009);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 14:36:26.2988 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7540ff8b-de76-4c29-25ae-08dac7dff122 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.74];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT067.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB6895 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=PhvZP3Fs; 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.20.47 as permitted sender) smtp.mailfrom=henning.schild@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?= What was called "servive_prompt" is not a prompt nor a service. Document what that is and rename the variable. Signed-off-by: Henning Schild --- testsuite/cibuilder.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index d5c83b222d50..07a9edc56d9c 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -229,7 +229,8 @@ class CIBuilder(Test): self.log.info('QEMU boot line: ' + str(cmdline)) login_prompt = b'isar login:' - service_prompt = b'Just an example' + # the printk of recipes-kernel/example-module + module_output = b'Just an example' timeout = time.time() + int(time_to_wait) @@ -263,7 +264,7 @@ class CIBuilder(Test): if os.path.exists(output_file) and os.path.getsize(output_file) > 0: with open(output_file, "rb") as f1: data = f1.read() - if service_prompt in data and login_prompt in data: + if module_output in data and login_prompt in data: return else: app_log.error(data.decode(errors='replace')) From patchwork Wed Nov 16 14:36:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2216 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 16 Nov 2022 15:36:33 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-ej1-f64.google.com (mail-ej1-f64.google.com [209.85.218.64]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2AGEaXij000310 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Nov 2022 15:36:33 +0100 Received: by mail-ej1-f64.google.com with SMTP id qb20-20020a1709077e9400b007ae67a9aa7dsf10020186ejc.16; Wed, 16 Nov 2022 06:36:33 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1668609387; cv=pass; d=google.com; s=arc-20160816; b=HJX3YNmXeqEwExWjNRWd7mEnMRe+f5avOO3D7FFJ/+6bQUNeQv4cvfuoOeO3+o2WuE IDdId47k6Gep80H03T/pwwZXHrmPOEz6/Rsq8EsNEtEeRoRBhyT9l93r0HSh7yLCeNM4 RQOxjb+PfdJl63HYSKY5juIhEzKUQl0WjPI+jpHUy7C9SQvXwYT9kwIXcrcGS/b9Ofgp p2So0c8GfjHRx+e1eTDcAV/9+hI/Gmkc6FQO6QnjIM60XZDkJUTYfdI/fGWfPvA3LQ7R xzqCMfeVHKEm4bePX3D2+dV4vd+3iKkLIt+oHcv89R9sHEDkdi01d1KnV2PNyyN/BS7T LSGw== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=hlnHpXQHaOVTuAvJqRqpH1P2AcsnlfnfrwBD7zo4DVc=; b=eU6NR7rLBH33Xdy2q9ElMtHXr5P/CnExIk91XRjGccmLaacnThO4VcMF3ajk/K2f9W tPm1Cf9hYodvMl78B7gDYQOX41hBV8i3gWq5mhM6k5/+eoeIq/ivlszERJzP2JVK4g3h 5MiXR+lXyNoZz21uAXxL1SNs1biQgA3aiqqG+2JY2uJ+oTAej2c9yC8WANIFE8kplfik BFNgoV9/FUFyC8X42SXTPvzaynIACDzDjkWHqpQ0wbkCUMsR+gVXPa6Ho19Bn825L9VB LSN/Q1mb3NVP1rur4y/XCvFAkjB/jPvZtuCOvgu/JwYjbYE7WM0yUGEq9itNs0O5BvFO 3BpA== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=O055Gebs; 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.249.81 as permitted sender) smtp.mailfrom=henning.schild@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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=hlnHpXQHaOVTuAvJqRqpH1P2AcsnlfnfrwBD7zo4DVc=; b=UQHnbJ1rXAOJxWNNmoFFGySF6dbObGSy1QZXdZ08g08Yxj8adHtP6aChnXB85sUPdp TGfiNWxvq7aGI5dUau/Q/KaUL50oUFfdNuQr+LwG0AqdmdHTlfXmx0WEDxpJAx/Jf8Go 2J3xZOOX36IOEksZMuQuv6l5HCqAyiLXURqDchh7p07afUWyNFruVs4aPn+Ug4/5/lXk L3jyUMTJzUohIjjQF0KpIV3KQGISrRNDXfoCoRSilsEpdQKu+j/hwiY1g9FiV0nTnUSe 1tT2xROmMEPZvhFbUCv4MLxG9HcL8zqAUhUpz6AbBZ3HMosNbvsU4L24sd2/vDkaybHb G31A== 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: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=hlnHpXQHaOVTuAvJqRqpH1P2AcsnlfnfrwBD7zo4DVc=; b=4uaANGjF8rEHIx5LAQuPUEByWDpkj8hwAuKE5BY3TfRU1FLVvhkTRUKhIhnES+LqA/ SU+6OeaYGWOtxO14D7WXKdPzF0vqgdhuM2pnTGi8inyB3N3h14UefNSbdUIXcOj/HzVD cJLogVBBW2rLdTQH62PUa3ehYi9RYJBS/lkWoyMCTQuq3uOh1C7la2u3ISylWXWCknfk DDfz1NpJbAB3nukAUsXxL5qtxhDqZ9mahch6MPZ5ARAtXGRjGJjdOuNrhdCPZr/Uc3if OiPgOOuQFb/H1RjqngGwV7V9AflGmmrZlF2BoeD7iUD6CIEjcnY7qlA+EXfWnLMFGBDI RTIA== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pm9MY4gccoK2DbUhE64xmH/pwFFceq/ue0sBY2oJHQXX/5P6wlx /jpj63BQeE/8XiMp5f2oMzw= X-Google-Smtp-Source: AA0mqf7K2VDwTsf63kdpXw9POuT4zzDeyUxS8ajPnmbuyxazGNRhsXdSHghZBlOW7wpiP0QkKpef7g== X-Received: by 2002:a05:6402:c10:b0:461:9193:7278 with SMTP id co16-20020a0564020c1000b0046191937278mr19888481edb.220.1668609387665; Wed, 16 Nov 2022 06:36:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:f182:b0:7ad:9efd:4692 with SMTP id gs2-20020a170906f18200b007ad9efd4692ls9843372ejb.4.-pod-prod-gmail; Wed, 16 Nov 2022 06:36:26 -0800 (PST) X-Received: by 2002:a17:906:9f0e:b0:755:6595:cd34 with SMTP id fy14-20020a1709069f0e00b007556595cd34mr18530202ejc.70.1668609386598; Wed, 16 Nov 2022 06:36:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668609386; cv=pass; d=google.com; s=arc-20160816; b=n0STilP5v+2W2cAf9a79aR8q9sF9YxA9n9/wLmuEmLbZsm5YGbEGn6FJD4JvnYkNOn H37bxP9MH5XkrXmYtGriXh9URpetDR0LICVC2ZL2oFGWjQflAALbOGykfdkWMtIlw86a /2t/cYh1YYfd9nMOmPuIE95RyirpIIJcOle7m+kvWmUfqXEvXUIHSXHWmnbKNV73Xao6 6D46QJIYtyUamdLCylWBqRDb9+YLeZcBRYtI2/vMxNYSGqaACZ4voXCD0oMOJAfRofoP ZdJAHuHM9LrRyBueQgLmdhJplgWFe5zOVLomWDO+qcP9hWpBW6+qKzRaKjn0jvn1IjRd VS+A== 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=4BiOzbFfopU714SMuEa3r5fPtWrnvgKNZMuDXw2iyqk=; b=xg/tmLBI+7LydiLFcQQGTyJO8Hb3E/t/MKJ+onERgxNkRRejK+kKFLtwoj1ZsmKpi6 Mc7Mybu5FuZst1vXdOhk7W1eUDGvQ9XL8yhgAoDVxBP/6b2DUR3eoPjfssKFAJGm7t9H 9A8GVJhK26IQrFfXWj2P1I4Ui+DsNI9Qy60oT3wl036T4bpWeCL5JgBxjAqRSiB31Rag 0F8vr1L0Qt1DaNW1ibZSKN9F+4o1Sd93GEHIVjfxT+FuQMs3pX6AjppOlrlJasf8dfGV tWdtcaKwRiA0I6Fv++NTersrfJG+3JCLRw33/YqHyddTJNSQnUjJzM7pfr1hUvUMj4m+ k05w== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=O055Gebs; 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.249.81 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2081.outbound.protection.outlook.com. [40.107.249.81]) by gmr-mx.google.com with ESMTPS id a10-20020a056402168a00b0045bcf2bacbasi589657edv.2.2022.11.16.06.36.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Nov 2022 06:36:26 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.249.81 as permitted sender) client-ip=40.107.249.81; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d5rhD80yp8SNGhbraxfPob/7/rE8gheJagBnkUbhmUPgJojBR1L1DDd3MgF490hmgBl5xwTc1yRNBgWX3jqa5gQ3IFOMZ1CZDovJS7h+1O/HTD9XNOkhYVhTB7MMp6elGar9mSdeYm1yrJKRcF8hGZeL+3lwTCA3ZBHrSlEOj9XAc8cg4CCIr7efD6S/rRCanl1mezOXJ61KD5P0IbrUpFuZ4CZ3qJT/X8Gey3hnmYiIqV6sgimB3WT6tKSnXa4isJ0XtuBqwmjMvlTGvT2WXmNkPyY5o4tW6LRe2UABH0AcoSLtS2YnAxJ3+1kRllu26OlZ5K+Pp6zomoINBcQZiA== 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=4BiOzbFfopU714SMuEa3r5fPtWrnvgKNZMuDXw2iyqk=; b=JqovmSWd7tD71Jr1LyFt7lTZWYqfFBnrpH1XVDVvVH8Ii5gWkAw+Y53r3bdyWURFHENplT6b5sBBB27p+fxyLF5K2+xrmv2jNomRC1vUevlP7bSasgkLmTqxuFzr4WvkMVuYQfM+2eR56/i85p3cWmmUvLTkhLWYmdtnTionji++zfQYB9nKsXWQ4tF2G1JExdh+c3NIcsECoeB+fTFCT5dDzMD0OQrpOH6nio3GFpoBoEhR2CpDcGoMvieVsnxLNwAvkWmrb7e1gwi65KrU3Tqa7mBpVrp62kqfpxVDweR/LIKsXWyLu1yyEL4jw5Yk4gQ+pnjdr87BZq9w1308sg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.74) 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 Received: from FR3P281CA0108.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a3::11) by DB8PR10MB3242.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:f9::16) 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 14:36:25 +0000 Received: from VE1EUR01FT067.eop-EUR01.prod.protection.outlook.com (2603:10a6:d10:a3:cafe::d6) by FR3P281CA0108.outlook.office365.com (2603:10a6:d10:a3::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.17 via Frontend Transport; Wed, 16 Nov 2022 14:36:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.74) 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.74 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.74; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.74) by VE1EUR01FT067.mail.protection.outlook.com (10.152.3.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.8 via Frontend Transport; Wed, 16 Nov 2022 14:36:25 +0000 Received: from DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) by DEMCHDC8VQA.ad011.siemens.net (194.138.21.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.20; Wed, 16 Nov 2022 15:36:24 +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; Wed, 16 Nov 2022 15:36:24 +0100 From: Henning Schild To: CC: Uladzimir Bely , Henning Schild Subject: [PATCH v3 2/3] meta-isar: install expand-on-first-boot in most images and add space Date: Wed, 16 Nov 2022 15:36:13 +0100 Message-ID: <20221116143614.24348-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221116143614.24348-1-henning.schild@siemens.com> References: <20221116143614.24348-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.172] 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: VE1EUR01FT067:EE_|DB8PR10MB3242:EE_ X-MS-Office365-Filtering-Correlation-Id: 43cb8979-a517-41ac-92fc-08dac7dff09b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6swW0rHBdDB7m9YuKlFVjgoYFXS0zn9jIhW4iFDmSjngEaoz/sB8FK0SP9yL25VoLCqrunwhaSSiHkbN12MNdIFQ/W5C7kgCP+R28CRyyLIGdzA2vY9kjjLXEcX28SiYn/IzSae0aDAzS/kxtiIqIPa0vsmRyMEwPSxfNi5Q/e4duiwrpqBbDgoQwHLJgg3nZ/CKiRoVnW/6q0gmsKAJAoG/hBvwfP/7LAQgwDC+B9jdNORR9Owqnctz+8rxvAxobIjTtmYj0QT3IVUEZGXaQB2Pu7hcRY/BdXADhByikyHpwjKiQEst+2ZyHbK+f8pTGLFMSkuY6ffqZF26qSL8iRZDLtKCpk3+ymSiaS/frScGBTHRVlufJx8QJUCpj0tWqnH6eIQ8/DwUrkq+lBtP4/9NkhWZ2kTxDNZNX/wmqq2og5oeahTdKv+zljZ78mZa0c3lP3flwDnVsqNUZAfJz4xhF7QKtgMbsWBVvshAc1kvuktzz8emHNMgN63nYuK+XMKc/xSp+8CD6vbJKBWXKUwt5QANGwtbtjMxu6lVCX0cqnhApocUrwJ9OPnlAZp+nNAjCLP4Itnr6Ex0duJGQ7I3IZSUknCfyNAziqMFQLQ4tl748Lh7i+tZfwIGrfVTiX7VFmGpJqP9+2mYUHxEFwkO5zjFoWPkDE5W+GlII5Db7JlVJ+SKj0hBbQAQKgSa7Ngbg9k4s9tHMffKwdBQoXlwbOnuy26SJtbg4fxFk/T5jC49Dmxb1g1/UPvU1/JLcE6pVAXx91z2eV9UYR3Yhg== X-Forefront-Antispam-Report: CIP:194.138.21.74;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:hybrid.siemens.com;CAT:NONE;SFS:(13230022)(4636009)(396003)(346002)(39860400002)(136003)(376002)(451199015)(36840700001)(40470700004)(46966006)(356005)(82310400005)(107886003)(54906003)(6916009)(6666004)(7636003)(478600001)(7596003)(4326008)(2906002)(86362001)(82740400003)(82960400001)(41300700001)(316002)(70586007)(26005)(70206006)(8676002)(16526019)(8936002)(44832011)(5660300002)(336012)(1076003)(186003)(36860700001)(47076005)(40480700001)(956004)(40460700003)(2616005)(36756003);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 14:36:25.4164 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 43cb8979-a517-41ac-92fc-08dac7dff09b 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.74];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT067.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR10MB3242 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=O055Gebs; 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.249.81 as permitted sender) smtp.mailfrom=henning.schild@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?= Here we take the most common and generic images and add some empty space at the end of then. This will enable better interactive use of our example images since people will have some space to install some more packages. While the space seems fixed it really is open end if the mass storage happens to be bigger, because we install expand-on-first-boot as well. Signed-off-by: Henning Schild --- meta-isar/conf/machine/qemuamd64.conf | 1 + meta-isar/conf/machine/virtualbox.conf | 1 + meta-isar/conf/machine/vmware.conf | 1 + meta-isar/conf/multiconfig/qemuarm-bookworm.conf | 1 + meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks | 2 ++ meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks | 2 ++ 6 files changed, 8 insertions(+) diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index eca2628c4ae5..785a104b8fc9 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -14,6 +14,7 @@ WKS_FILE_ubuntu-focal ?= "sdimage-efi-sd" IMAGER_INSTALL_remove_ubuntu-focal = "${GRUB_BOOTLOADER_INSTALL}" IMAGE_INSTALL += "sshd-regen-keys" +IMAGE_INSTALL += "expand-on-first-boot" QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" diff --git a/meta-isar/conf/machine/virtualbox.conf b/meta-isar/conf/machine/virtualbox.conf index de3d04c3c4b4..8c3e9bacbf9b 100644 --- a/meta-isar/conf/machine/virtualbox.conf +++ b/meta-isar/conf/machine/virtualbox.conf @@ -10,6 +10,7 @@ KERNEL_NAME ?= "amd64" WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" +IMAGE_INSTALL += "expand-on-first-boot" VMDK_SUBFORMAT = "monolithicSparse" IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/machine/vmware.conf b/meta-isar/conf/machine/vmware.conf index fba639b19350..42503374742c 100644 --- a/meta-isar/conf/machine/vmware.conf +++ b/meta-isar/conf/machine/vmware.conf @@ -12,6 +12,7 @@ WKS_FILE ?= "sdimage-efi" IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" OVF_TEMPLATE_FILE ?= "vm-img-vmware.ovf.tmpl" +IMAGE_INSTALL += "expand-on-first-boot" VMDK_SUBFORMAT = "streamOptimized" IMAGE_FSTYPES ?= "ova" diff --git a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf index 126935b06fda..0b9ecb664545 100644 --- a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf +++ b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf @@ -7,3 +7,4 @@ IMAGE_FSTYPES_append = " wic" WKS_FILE ?= "sdimage-efi-sd" IMAGER_INSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}" +IMAGE_INSTALL += "expand-on-first-boot" diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks index 754fbc46f8e4..e6b7128eb3ae 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi-sd.wks @@ -6,4 +6,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=systemd-boot" --ondi part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +part --source empty --no-table --ondisk sda --size 256M + bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" diff --git a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks index f3addbc7515d..5e555b3cc472 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks +++ b/meta-isar/scripts/lib/wic/canned-wks/sdimage-efi.wks @@ -6,4 +6,6 @@ part /boot --source bootimg-efi-isar --sourceparams "loader=grub-efi" --ondisk s part / --source rootfs --ondisk sda --fstype ext4 --mkfs-extraopts "-T default" --label platform --align 1024 --use-uuid --exclude-path boot/ +part --source empty --no-table --ondisk sda --size 256M + bootloader --ptable gpt --timeout 3 --append "rootwait console=ttyS0,115200 console=tty0" From patchwork Wed Nov 16 14:36:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 2218 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Wed, 16 Nov 2022 15:36:45 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-wr1-f57.google.com (mail-wr1-f57.google.com [209.85.221.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 2AGEaiwQ000381 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 16 Nov 2022 15:36:44 +0100 Received: by mail-wr1-f57.google.com with SMTP id s11-20020adfbc0b000000b0023659af24a8sf3806875wrg.14; Wed, 16 Nov 2022 06:36:44 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1668609399; cv=pass; d=google.com; s=arc-20160816; b=q5oJNrKFXpIKKYleYDql7G9kbn82NPwuDRAMeFzAJLZrYXSHq90HPpaiI/abrJ3cCj W/HowDoUDwHtRE/6gV+F7ajYMB19SgOuEHoYq5ppcGa0tlvq1OCILALBWdJCUcxT9Gg0 2S0GJ5Xr4GxmzJuHi9hpENWGLS/2c4QMos2rHuElZ5kFUNxURTdlxC1O30Kk0TGYSzYI 2nQX7ijYzIzGhqUu3dXuCVTcX8g9t4biwU2isEo2mNkjO1XxpZbaetM47gL7Omu/euBY Et4ZkFBEogrQ1ngAb91JjqETabDn11D51RmQSJITUQdKD/QcCBzXej4xxiTlO+2QkNWZ bLSg== ARC-Message-Signature: i=3; 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:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=/ne9jq3dC3LBmB2dhma4ZHH0ra030qSNRKy2KuKBc0k=; b=jCJhHiYkbJLVMJkvFdrV2xA+Nua4yI2Yye1R2i1eLXYH4q3D0f6cGTLzujFhvRN+eu iTXHTQbmt66N37Q9KubyqbSv18qHcTSGR+AD0OW+8z9XQnpbb/2ociH5mCGokjL0EJWD nivNkfbGChYBtIx8pc/u6om3pqUK4IQRb2qlTn4m4xEZzADEa8Hd0W5kqdAg4W2N7dZU GZuDTnW3Zl2AP8/GdM+ZNVWArk5C1ZvI97Vp3kZ06HhVw8Nk5UMThVCrrBgWGGDcFum3 TfXprNOwlbuIPMVQu/yLOyLIZNef83gWvk6iJfp00gzIJcF1A2IbGD/r0S6U8trb1MTS gqJQ== ARC-Authentication-Results: i=3; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=He7QDfKN; 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.7.87 as permitted sender) smtp.mailfrom=henning.schild@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:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:sender:from:to:cc:subject:date:message-id :reply-to; bh=/ne9jq3dC3LBmB2dhma4ZHH0ra030qSNRKy2KuKBc0k=; b=YAN/zsBVQiySQClgVkehY6F7NsBdt7QZaKCrYczADOp1X2BX1znj3VH0HDzU1ZSEhX Z4CKLVtD5NIJoWd93FFSZkoUta2D/co0JbFjcCObp4LBv2BZWe1UcWZMMPbpSyyTSc4e 6OWrf3sqMxP8O/za9ujce+Nb5yDkQUHeJVzZIWgINVaQ1hxD2u6HFAyvuubXg+f1aPTK /goDC+qwyothCG6qZwaINkzw9EfmYqVie2H88mjnpWZ3OUE8PkUKTQBQzJ++r5V73Uyj tialuA869qIBmW3q5cwtyW3XFpaywFK8BpRuy92sQzKaChUHW/NhR2RFd4nTeQsMU8Ka YdjQ== 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: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=/ne9jq3dC3LBmB2dhma4ZHH0ra030qSNRKy2KuKBc0k=; b=VfzhskYvMhX26qkPRuJVTFvg6fM6NvEdi3Msprlaa+awKwbCorfyQC6b56l/78jD+i 6x0c+9RbdfJBQ03giHbVI6LlnSbVgX6X5miFmUSEGJlB6wQFWcRp5V8xJv3eGN+HC0Jw GjP2deicG7LOLSoPmgf8L7Mpw9r4tqibOrkjB++NnmUzebyrNle3XQfKimClk06WbStb QeWIjin/vPNoFaj1/VGpdoN41iKHg073TPOj0X4FFPXJJ7EUlx4ZY59yU0ZfPh9lMaJB VUy8wlO/T4dw8OhquNnpDJU7k2w7iNOPZ63Wz38nffHh8lfrcUtiqeEp1OugncR6U4zT 3qOA== Sender: isar-users@googlegroups.com X-Gm-Message-State: ANoB5pmlgm2WCTllyxpcAJaNMjvdc/WCncfEciDfVeZqPFM5NmcbJZe1 8PsxZTlhIpmyd4pfltSvqtc= X-Google-Smtp-Source: AA0mqf4EGxcTIPU2H6Jk1MsW6HfwqJ7If7bch/mkmgMslSQJDezzX9pN1yRn7cVmGu0fbfgQZ8mnNg== X-Received: by 2002:adf:e2c1:0:b0:236:6b8b:60b3 with SMTP id d1-20020adfe2c1000000b002366b8b60b3mr14574277wrj.711.1668609399334; Wed, 16 Nov 2022 06:36:39 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:cc8e:0:b0:3cf:afd2:ab84 with SMTP id p14-20020a7bcc8e000000b003cfafd2ab84ls1137555wma.2.-pod-control-gmail; Wed, 16 Nov 2022 06:36:38 -0800 (PST) X-Received: by 2002:a05:600c:4c96:b0:3cf:6a66:e324 with SMTP id g22-20020a05600c4c9600b003cf6a66e324mr2285922wmp.158.1668609398315; Wed, 16 Nov 2022 06:36:38 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1668609398; cv=pass; d=google.com; s=arc-20160816; b=kr30zyMakNGR0vCmWyNAq4pB/IBHmkCaziAmgRmuVt399q3S6t7+93YUDgy5bvUaHZ kJ3bDIryyxd6C/2qDysjj+Si50zhXWiYRlvIfK+xyGhuMZZcejpqGYP4Xp9/DoGiqcVm WhUAETYgkbnRpoIj/Avlj0DWcHINzqOGNfFPlRd6kSk5aqFfKOUY+xDWKkxAEqzXsNoz veOBV7AO3ukPUNVRREU6RldR/WBr4t4hc2+6oOV5WEnSRxwlh8Jx/bdhjFu6dLTe0VXd ezzoYtd9qI43yHWEiIKGyiMQkJTgJTdMQcm6P2HZleFIOy9gzxlY3X+G3TRw3J8uDyu+ Ibkw== 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=foKeapaeW4sOJah0erQk42JtjHpvF3v6KL6PJ/02n+g=; b=CM3qVC2Ea1NtvlS5eHLYe8wzYc9jtp6MlTAOXZGUIJAgntR+QieHgVHOhgX0wktk9i 42y2jRTPKH4KJsSBRGlrmE2DGZinSMp1U/vd+TiRPUQIhmELzW/CIwnBPbKjiDiRPozw +Ai0QZAzhXChPjDOb49bmp4at8+Cw/vt7ptA+G2JGi4aJJSBsKxR2zAss9sMjJ8cxLSl K1Y7uj/2i9qIWun58/j/DJOkNNAhs7ijwSBjkkKaX8wEVVJ0SjSwvWZv7E8kM4pHEnKQ mEPrXG0kGKFQX5p5WRNFxIvCW+qo+V2qQwMEhOP9wbCBb8/HFsgwsKJ24GOK7Nuyza5i jX2Q== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=He7QDfKN; 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.7.87 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70087.outbound.protection.outlook.com. [40.107.7.87]) by gmr-mx.google.com with ESMTPS id f187-20020a1c38c4000000b003cf567afb1fsi153619wma.3.2022.11.16.06.36.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Nov 2022 06:36:38 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.7.87 as permitted sender) client-ip=40.107.7.87; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ih5mghePFw5lyvMrYKKWVGb49nD5fbeAu+abiyfKAbhmSj7SRo/oFkqa+z+YR+NLlybeSgjsouMFHjqIKQY0YUctZd+0+b0dmNobYD/sAd9HoOEwth486hb/4wa4hohHruwH2uDtbWxRVL1KlNW8c9CEMUrTVPUYnG0MHQGEfsH9Fz5TgB1TMvXBOh1iNoxaDguRCJNFAbHaV+RLmu5w7sLQ4VPXf8dffjhmyO3p7aK/VCP7JjikwjrujKvj7xokxr4yqCaLRVHm2glf9PKv24AG9um36Id7QiokR0MxcNmPz67Sm+41OOO7Auf902OzQC+KO+QtRTyfXc2HXJHk3g== 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=foKeapaeW4sOJah0erQk42JtjHpvF3v6KL6PJ/02n+g=; b=Pxg3YZQWXu1TzbohUz4MmrDpIoJ1SwoCKmxKbJ+hfdGrlwBApJGxwLwtCmr/B1Mn+UgUlLe3OjyWpDtPf4Nx0R8ozEz4Fxx/pvSN8ecTL23EZHxTWIT6eKvbqkCSuoa67DdyEdb9658FaCDieiJWA+dHzJ32JC65gE6+Cvx20UOj/vXtFfl1oJptj1y76uvLZaKPbnkMHyGU7497cuP9GorMYxewj7D7qX9rEBlWAOtExx8Qf6w1tqqphMrzYbEeoSwa1Aut3jwSdVaLnER/Tw7JjRwJ3CBte3MPfFPLRw5XiSDczMp9N7S9iRaFeU5Qv3YfmgpaBO5TAM4XuZF5WQ== 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 Received: from GV3P280CA0020.SWEP280.PROD.OUTLOOK.COM (2603:10a6:150:b::32) by AS2PR10MB6639.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:55e::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5813.12; Wed, 16 Nov 2022 14:36:37 +0000 Received: from HE1EUR01FT042.eop-EUR01.prod.protection.outlook.com (2603:10a6:150:b:cafe::58) by GV3P280CA0020.outlook.office365.com (2603:10a6:150:b::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5791.26 via Frontend Transport; Wed, 16 Nov 2022 14:36:36 +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 HE1EUR01FT042.mail.protection.outlook.com (10.152.0.228) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.8 via Frontend Transport; Wed, 16 Nov 2022 14:36:36 +0000 Received: from DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) 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; Wed, 16 Nov 2022 15:36:36 +0100 Received: from md1za8fc.ad001.siemens.net (139.25.68.172) by DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.15; Wed, 16 Nov 2022 15:36:35 +0100 From: Henning Schild To: CC: Uladzimir Bely , Henning Schild Subject: [PATCH v3 3/3] CI: expect a message about filesystem resize vom expand script Date: Wed, 16 Nov 2022 15:36:14 +0100 Message-ID: <20221116143614.24348-4-henning.schild@siemens.com> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221116143614.24348-1-henning.schild@siemens.com> References: <20221116143614.24348-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Originating-IP: [139.25.68.172] X-ClientProxiedBy: DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) To DEMCHDC8WAA.ad011.siemens.net (139.25.226.104) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1EUR01FT042:EE_|AS2PR10MB6639:EE_ X-MS-Office365-Filtering-Correlation-Id: f745cd5c-f14d-4a5c-7488-08dac7dff761 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2CYCf5IoTvZL4MYmr4QvlAdS4XBJCJnFFKtErgwmvj02nPppoSEmTVOPvRk8hWDv67H95xtVa4cTK/dlueQdo+JtsMWJi96i3Pvw3NdgNjMtOrzd77pNmNzM5Ke1k+CRkms/iuAuOFLeXejreZUM74HDIZmDtYP8SkERUFjlGAFrBrDpqjT0heyFo68Vo/VsvvJFtpE4pBiiJxYSzzG53PJOYOLJNj+jK7iT8yJJv54yz4bCei+o5CZPEprPHWQEKd6Adqwu9wjeVvNc66zZLgBRMn03H1seAT8lE33+pyGrCKNUDdpDYdbqgma0HvcPXG9wnG+1FHBwCGT+LVsdsXeR0oWPpuNyfWzTeTdKbrEEuCWIg5YUSibyIgbQCv5z53Eegni2s3GOSRxRk2s1C7/bxbPLP91Jw4WWSO9DCg1ytkewAxZiDyCMB6KW4MXUDb3ejsjbRSRQvNFKu8SMTee1z46CqamsuqJF8MCB8k5hs7wdDg97S9AOMAvR+sX55T73eRFQVkRa/QJ5PQ9hM+uovMy69K8+i+/baw/OPdnjY4oOxH2r41MicbJ84snmOGRXYDIpv26qVpb2ibufhpVi9ViAQcTpCeIdfTGGlzEGx0ca902xfy8Sbq+NvAgykllwIAW9FtpmjfgcbykD/k3JBuAiYBAVhKjhvl6EhXBO3Wc7T9Ki/aDqbxLrBQ7UQe1iTByUWm+cAy11TFW7ySyr7aoVW0uFvLgXe4hbWWAL+2zNbP12ywJbwsBIdsN7fQeMxwHUumsFN6yXeN8PWN1+PJoe9UAEY9NG0h321pnXFwOmjRprDH4is4RxuLna 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)(346002)(376002)(136003)(39860400002)(396003)(451199015)(40470700004)(46966006)(36840700001)(82960400001)(40460700003)(41300700001)(82740400003)(70206006)(54906003)(6916009)(15650500001)(5660300002)(36860700001)(70586007)(8676002)(316002)(8936002)(81166007)(86362001)(4326008)(107886003)(83380400001)(356005)(47076005)(2616005)(40480700001)(36756003)(26005)(956004)(16526019)(6666004)(186003)(2906002)(82310400005)(1076003)(336012)(44832011)(478600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2022 14:36:36.7246 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f745cd5c-f14d-4a5c-7488-08dac7dff761 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: HE1EUR01FT042.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS2PR10MB6639 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=He7QDfKN; 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.7.87 as permitted sender) smtp.mailfrom=henning.schild@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?= 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..5667534d7f1d 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 = start_vm.get_bitbake_env(arch, distro).decode() + wks_file = start_vm.get_bitbake_var(bb_output, 'WKS_FILE') + if wks_file and "sdimage-efi" in 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: + 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)