From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7159568422443941888 X-Received: by 2002:a05:6512:2a92:b0:4a1:d2c9:c2d0 with SMTP id dt18-20020a0565122a9200b004a1d2c9c2d0mr20982750lfb.278.1666966925721; Fri, 28 Oct 2022 07:22:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:2122:b0:26f:b780:6802 with SMTP id a34-20020a05651c212200b0026fb7806802ls536054ljq.0.-pod-prod-gmail; Fri, 28 Oct 2022 07:22:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7ueK9l5hQDDmkmwqyIql8fddxrYEsOL66d3XlReOTWAFVy9chWVGHBKm7XGLJ+RfadRXim X-Received: by 2002:a2e:9953:0:b0:277:1888:dab8 with SMTP id r19-20020a2e9953000000b002771888dab8mr7511641ljj.131.1666966924403; Fri, 28 Oct 2022 07:22:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1666966924; cv=pass; d=google.com; s=arc-20160816; b=NrZmRxgJCzDI4Zj9bYwrt4f0lmHuGXatKvLw77a6NqGn0nYlYlFT2CPobmkvdoYhb7 qSjgLtirq6LZiFconPPS1zifpvLb9Yg+JFGWQiQ4aVBxXYS7Yk0e/ZK4vF34nr/qhHLZ BRJy+uShzYnESID/m4lIXx5NoDsf/G2FIynX5SpmQRFj312EYaR0TWy6j2KYWv6fo8n3 maGURq+a6Wh74rQMN33biqDI9QByS8BCeFLAB4C8xZr2u6llZLh+3XkjYUbAfU1pB6ZU lXwzilposcZJHPGtJUX48ItI3+qnYLlNGgEbRw94sdxp7XaTcoMAtiZ2hgBQfk2eskaj qdrg== 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=6bb0csRdHzrJy7gpr1nEv99B2D9ErmgHO1pjMXSGi9k=; b=h/k5hO2vlgcQrZpOTO7iNyzVJ4lFsRk5abXv49PAP0zMk96t8cAd+D6XXdrMpLmWOb QJ+NjbqfT+u7mo4WBllfMD/F2sr4mbFUF9ARK29tZqo8kTQC/z46r7SUrdmGqMPVxMV0 rtouqUvetZT0wgPsr1qzAiB2wa3afQidtswRjsidcM7I4PETi+FzhTtM6RlcVf6xC7Kn o5IQL4OFPMVcw6mlrwDxHj02w5PCMmn8zFb/bprJE+EZvtU62NhMpBmkF+32vdApzV6t E9naWCxbIvWb2zHwghrYFffvgyZDIDpAECRJ9mWoU6LOLAZsz0v+dOAW8T6lmzjfFVlH Ax6A== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=fIsLAa3O; 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.6.69 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-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60069.outbound.protection.outlook.com. [40.107.6.69]) by gmr-mx.google.com with ESMTPS id e2-20020a05651236c200b0048b224551b6si147546lfs.12.2022.10.28.07.22.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Oct 2022 07:22:04 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 40.107.6.69 as permitted sender) client-ip=40.107.6.69; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=fIsLAa3O; 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.6.69 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=LpRheHrBxktLSOcgKD38u32u0esOduZ4TqEATqTuUPrFKbDaS6E1UGltbJMZKI7W6qSqwBLcl3QyoXhed71MtnnPeO2bNh21j+wEPzuELre6W0g1D5GB/ucukOhz9LYWstTZBHwj2Gk34bUEAx7Sy0HTFWVXvZDXSx4mMIEHDRrpKlfyzVNpfpCdA23CMhgQntFmQqYUu6HuNHzpbtRVXA7rLtSZbCcsSttvBHNyDL9H1LI2pKPj58OUhK0Prg8rggRrH1Bf61ygbL7QjU7aZImMBOPm+VZAs/6HH61HWaXd3103M6XV++BuIgF5PhK+8p0J/2W//JIaObtDM3Zz5g== 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=6bb0csRdHzrJy7gpr1nEv99B2D9ErmgHO1pjMXSGi9k=; b=KbrSjAmuGD1xFeZ8ls3cKs/YAYzx43qY1I3KZ7qC1ODMVFaCf7aBoJy/apceZp6Ayc0Gc5QWkzBWPDh84yQ2FdlfVhHy15eI/k9QAmcgXzNrNBo819juGUEVhdWb4BupXuVSxyeC02H/Qgg59x8tj9iAtRmZ0OIP/ptQb3g64L4u9GeVHKvkb0YZ/VFAuYBQ+e1mr6yPsTQc6HbAH7qesFfR/Iy+dQdKx4BbivBd/7uXqkGfKmk9znPn99CVQmFzo2RT3lpMU+YeATFoHoVJ43dRky/e+xjSDvsXTsu7+RNlgecgxalV1fHN5ZfT2BgzV0/tpOTqeniiU9+9+o17VQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 194.138.21.75) 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=6bb0csRdHzrJy7gpr1nEv99B2D9ErmgHO1pjMXSGi9k=; b=fIsLAa3O6vlxGMw/Bm+oPjP29Xkip8muAxSqQQd2upkx1L45fyOkTqJnHg7MAWYnflwusraX843xvCRkS788hNcKfkIto8TuTXhXTM/nEktGdt/ZLY+oPMqnAhjZQdtuSjCZp4pj7GVJH19mJ3tdmj2CTnRpICmx6E+fLK0SkpZmCyRRJzzoNRlQtMhKofEYjO39asonZTsxc95rnmeC51LW9hnqt5oAqtEO84BXQGHYnBlpPh2vhVtFT/jnuDpHbSpxs8RTlPcpR0RDqYfmLMufv/GV/HfVtqUz5Q6nku0TKrZACkDQlGWPsIDHOXSG2TRa82yhYTAJiVxBhLj5TA== Received: from ZR0P278CA0028.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1c::15) by DU2PR10MB7741.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:10:49b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15; Fri, 28 Oct 2022 14:22:03 +0000 Received: from VE1EUR01FT028.eop-EUR01.prod.protection.outlook.com (2603:10a6:910:1c:cafe::a3) by ZR0P278CA0028.outlook.office365.com (2603:10a6:910:1c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.15 via Frontend Transport; Fri, 28 Oct 2022 14:22:02 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 194.138.21.75) 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.75 as permitted sender) receiver=protection.outlook.com; client-ip=194.138.21.75; helo=hybrid.siemens.com; pr=C Received: from hybrid.siemens.com (194.138.21.75) by VE1EUR01FT028.mail.protection.outlook.com (10.152.2.220) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.14 via Frontend Transport; Fri, 28 Oct 2022 14:22:02 +0000 Received: from DEMCHDC8WBA.ad011.siemens.net (139.25.226.105) by DEMCHDC8VRA.ad011.siemens.net (194.138.21.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.15; Fri, 28 Oct 2022 16:22:02 +0200 Received: from localhost.localdomain (167.87.54.8) 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; Fri, 28 Oct 2022 16:22:02 +0200 From: Henning Schild To: CC: Tobias Schmidl , Henning Schild Subject: [PATCH 2/2] CI: install expand-on-first-boot in all tests and also test Date: Fri, 28 Oct 2022 16:21:45 +0200 Message-ID: <20221028142145.4428-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221028142145.4428-1-henning.schild@siemens.com> References: <20221028142145.4428-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.54.8] 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: VE1EUR01FT028:EE_|DU2PR10MB7741:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f3aea13-243e-439c-d28d-08dab8efc8a1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: T5wdwl2CF1aT2VdT7sRPa9R/OQtkt4MU5m/7e3biSA/fgdC4sU5G8+dBI5HtHUlGprfcNtPeUIDk1vFpATXl3uW+yGvdYXRZS6pIZRicKFv6adh/qk7Xep/lVQZqG1NL0+Viw4fO3p32npN+zgmfWKQRaHYsGmefX7/pg18CIHnDRcr0x6wLQMNcU7sKPAzNsyCswLN5Qp1HUmKSy6jfj2SLEuMcwMK/Rsrem/RnDf0wX/kbeapqsy1BJrgXinBUzal3wXsn3SdnZMnx29vwryjLjDMQx6z0HSUBKsV0mPs6W8SKfFs/itguCJe40noSaxabs0BFn5SkokLl01EWl4xtVhLwSCMo4GyjoPsqoGGVkTgH/J1KqF3MSda0VAJ3FhN1Gbz35w5Wm7z2VGmc5A7uqeopSSPRxaI/eC+sohfDxBieAF/oS9x2MYhLy9T4290Pe9NZCAKq184xRWFOesi1DcR+wGawQ1pxQAl8sFrsbtLpER71dqQfobDQprtayxM1KNQbCTZdfnrB59bC7Y3fDWt2V6J/4UxDbB4444xCZaw4fIZwUHtdbup/lqKOaWQpJAoYaFmvX3EKro+l2leVaq0OfYNKZzWzgMYwnpaXG8Bngx7lFI1KBCk6/AeEeJGfyUIP5G6I1V2n3mOXjs0P0F2ILxMFg52EkC2tsNgNWQWu3+PSrLbqjtD7h0Rwqe0mhyH0A9iSgZzhI/Z8PFsD5oUj/eo8jHxGrYgVFeH6Bn0k+kQtu5oEzIgOyy0/iexvduKI971seMu67cN5pI0BqUDE9vd4vDPLUn0fR+rPEL7C+LE6lRiDkMvAM2kh X-Forefront-Antispam-Report: CIP:194.138.21.75;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:hybrid.siemens.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(136003)(396003)(39860400002)(346002)(376002)(451199015)(36840700001)(46966006)(40470700004)(47076005)(83380400001)(86362001)(81166007)(36860700001)(82740400003)(82960400001)(356005)(2906002)(5660300002)(44832011)(4326008)(8676002)(41300700001)(70206006)(6916009)(82310400005)(70586007)(8936002)(336012)(107886003)(6666004)(1076003)(26005)(2616005)(186003)(16526019)(316002)(54906003)(956004)(40460700003)(478600001)(40480700001)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Oct 2022 14:22:02.8550 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1f3aea13-243e-439c-d28d-08dab8efc8a1 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.75];Helo=[hybrid.siemens.com] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT028.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR10MB7741 X-TUID: 5hzsq7cHQHqQ Install the package in any rootfs we build. And also resize a few images when we boot them and check the output. Signed-off-by: Henning Schild --- meta-isar/conf/local.conf.sample | 2 +- meta-isar/conf/machine/qemuamd64.conf | 1 + testsuite/cibuilder.py | 18 +++++++++++++++--- testsuite/start_vm.py | 11 +++++++++++ 4 files changed, 28 insertions(+), 4 deletions(-) diff --git a/meta-isar/conf/local.conf.sample b/meta-isar/conf/local.conf.sample index 57d062025f21..27becf19aefd 100644 --- a/meta-isar/conf/local.conf.sample +++ b/meta-isar/conf/local.conf.sample @@ -198,7 +198,7 @@ CONF_VERSION = "1" # # The default list of extra packages to be installed. -IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello isar-disable-apt-cache cowsay example-prebuilt" +IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello isar-disable-apt-cache cowsay example-prebuilt expand-on-first-boot" # # Enable cross-compilation support diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf index eca2628c4ae5..6e3561901447 100644 --- a/meta-isar/conf/machine/qemuamd64.conf +++ b/meta-isar/conf/machine/qemuamd64.conf @@ -19,6 +19,7 @@ QEMU_ARCH ?= "x86_64" QEMU_MACHINE ?= "q35" QEMU_CPU ?= "" QEMU_DISK_ARGS ?= "-hda ##ROOTFS_IMAGE## -bios /usr/share/ovmf/OVMF.fd" +QEMU_DISK_RESIZE ?= "1" MACHINE_SERIAL ?= "ttyS0" BAUDRATE_TTY ?= "115200" diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index 07a9edc56d9c..fb0daedc7d49 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -231,6 +231,15 @@ 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 + for arg in cmdline: + if arg.endswith(".wic.resized"): + # in ubuntu the resize works but no trace in boot log + if not 'ubuntu' in arg: + expecting_resize = True + break timeout = time.time() + int(time_to_wait) @@ -265,8 +274,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) diff --git a/testsuite/start_vm.py b/testsuite/start_vm.py index f761a8bda789..2262af557a32 100755 --- a/testsuite/start_vm.py +++ b/testsuite/start_vm.py @@ -5,6 +5,7 @@ import argparse import os +import shutil import subprocess import sys import time @@ -57,6 +58,7 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): qemu_machine = get_bitbake_var(bb_output, 'QEMU_MACHINE') qemu_cpu = get_bitbake_var(bb_output, 'QEMU_CPU') qemu_disk_args = get_bitbake_var(bb_output, 'QEMU_DISK_ARGS') + qemu_disk_resize = get_bitbake_var(bb_output, 'QEMU_DISK_RESIZE') == "1" if out: extra_args.extend(['-chardev','stdio,id=ch0,logfile=' + out]) @@ -65,6 +67,15 @@ def format_qemu_cmdline(arch, build, distro, out, pid, enforce_pcbios=False): if pid: extra_args.extend(['-pidfile', pid]) + if qemu_disk_resize: + suffix = ".resized" + abs_src = os.path.join(deploy_dir_image, rootfs_image) + abs_dst = abs_src + suffix + if not os.path.exists(abs_dst): + shutil.copy(abs_src, abs_dst) + subprocess.run(["qemu-img", "resize", abs_dst, "+2G"]) + rootfs_image += suffix + qemu_disk_args = qemu_disk_args.replace('##ROOTFS_IMAGE##', deploy_dir_image + '/' + rootfs_image).split() if enforce_pcbios and '-bios' in qemu_disk_args: bios_idx = qemu_disk_args.index('-bios') -- 2.37.4