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)