From patchwork Fri Jan 23 08:24:46 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhihang Wei X-Patchwork-Id: 4825 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 23 Jan 2026 09:25:18 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f57.google.com (mail-lf1-f57.google.com [209.85.167.57]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 60N8PH3r015363 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 23 Jan 2026 09:25:17 +0100 Received: by mail-lf1-f57.google.com with SMTP id 2adb3069b0e04-59dd6e96023sf1336361e87.2 for ; Fri, 23 Jan 2026 00:25:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1769156707; cv=pass; d=google.com; s=arc-20240605; b=diuS8eVn4R+/mKiwH9ET1MSp10nSsNdNkXJOFcaQWNOa4JYtr2Cbugd6vNXiVd4skA Lkkx9dzw4gvS64HnPLBBX0lH70JTlkVrDEw9N5/f2NExrbEfqt7b3yItO2yzY027ngiz FbRFZtY57pj9A9w313W3lsN+onT690yD0v1wCz0WCoH6cPeuTn3M3GRki/cJsTFSPHFY gG8/+38cu/FyTLHLsIBK9/docx2SGg9CKpgqbmHsdDl4Zs8pxzQxsVoVlWxMfldTBWJh HHbMGFLhAwRoLj/3oeDP26Um2CAqAHadvtx2MXzmQwDjfv15m3pWhlxmecuhoXz4Z326 qX6g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=tfPOHAx5R2HgivUl4vX0gq8ZWTTC3Vk9f7OGflrGpHk=; fh=22kH6/gbcmn5JRCnEgQU+unGlmqHRPx2hwsrWM3iMME=; b=QCv1+i+080PmqsYudEFyPcmg+tzrXIiAIZxqLeM7YkPtgyubYFEe7lgzor/AhZ3sHu PJcoNZBnE3CsPsxVu0ZEq9IJCRgcUiagh65CNIe8XGCd7d66qZ/3j2y3WLeMy80k2Z7F Pz+z1hRMRS2XdFlTjdUdHCVUfbfXZQ4eQ5ImGkkl/vxNnlz6EGqoNg8PsKuHoE/rbraz hjDTnuUcQcOjGM8Pv8ZnJRkkd+T/6rPVYNdSP/4yp5Hb37LYMMA39joxVi4oMO2RMDtf 6z+npirN6nxTLyPqIclpvWU4QEqMu9jJySnJx9LmVizNzpb0S8uRKfmIws3NreMU4Aj6 mASQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1769156707; x=1769761507; darn=isar-build.org; 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=tfPOHAx5R2HgivUl4vX0gq8ZWTTC3Vk9f7OGflrGpHk=; b=je9CqpNnRdFTWSG3U5rkUvrpTU1kNlww55jgMkMT4B+5G4OHBAEcMlZy6QhspzkWwO z/J0VEUVOSQ2K18mTDxQ/zxucUB3QvgWxq3RR8EiONM3XWDv4fsXoN6kmZirUhrqxDEb QQrEjmOyxL8NqBnFg+uiuJvD0r0ZzxhVDc0iqdJkl/VBD+chkHkJV+Xe2q0ayi3xuTZC o6HWR3JMFOZL6imP0FPSC6ZC9nUbO1Oh/s0iVJQf1m06YxqtWNtlf/ramjfF9EoE9Dwp y+Vt3pKm++LEOVqKRv8VRMJF+guV9UMh5GMsG46tq8+xGSfskHS0DWsNvzGehUxly3HP llnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769156707; x=1769761507; 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-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=tfPOHAx5R2HgivUl4vX0gq8ZWTTC3Vk9f7OGflrGpHk=; b=R+pNHZ2V2O3EcDB3AjZZ0uhF7ktegHGJ8ZpxmlFfA8LNOH4ihg64zJ5pjd5bT3a+Ig J6Zh+A2TmkwQgWEQkm2rIRiLx2rz42jpbYsV6Iwm/BGqUPvacRM4dfLvYchByL62Hrmq eLSLnAn4D3Nyf1zOqhm7o8B9x07DN5aNdRQds1v4gg1pXDNc4+7G6ideJN67yyhDKghc kX/A3s4YMYg+zJeD07dEXmJ+gmqc8nizpSEoi7V5y79vSHJRs3L/QCQWEPae2BvWAL+M o93AWUrv17BsKCrPDWz1/R+ZHGewuuTwOKRAK26Qh/dh5HCdXr11FC2Qr8aIZVQwROsk s7mA== Sender: isar-users@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCWDKHJnOGJkVgNZXIoei+hKqhA4DV/gTpOaxNSRcZQ+/y/iiK9h4yPChEScNf0kPIEUUIr/C+U=@isar-build.org X-Gm-Message-State: AOJu0Yw8mtIa6GS5CklM8/uEGo9S2rNVxDODn7fMh+pe++sgZu8MXG+Z /J7dqFMiNFVXc3Z/nwlN38I+f+HpKIFizTNcpXbEnK1lTucXxHCuY0qT X-Received: by 2002:a05:6512:128c:b0:59d:d7d5:9026 with SMTP id 2adb3069b0e04-59de4a2b7a4mr614414e87.49.1769156706864; Fri, 23 Jan 2026 00:25:06 -0800 (PST) X-BeenThere: isar-users@googlegroups.com; h="AV1CL+H+STq0e7a9LGpD0uUp22+ey7moYYUpWgSmgKOfmC7Frg==" Received: by 2002:a05:6512:3095:b0:59b:67d3:6052 with SMTP id 2adb3069b0e04-59dd79861d5ls649449e87.2.-pod-prod-03-eu; Fri, 23 Jan 2026 00:25:04 -0800 (PST) X-Received: by 2002:ac2:5684:0:b0:59d:e75c:4cd2 with SMTP id 2adb3069b0e04-59de75c4d05mr395169e87.33.1769156704257; Fri, 23 Jan 2026 00:25:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1769156704; cv=none; d=google.com; s=arc-20240605; b=VreSzUdZNnlQDtUr+WBXnBO3cfxjTZ+N0PJm2Ylsje1orYJut9SuxXa3wmfQXXA9+I 1KMQeNT+Sd/x7MeShEcv+U/b41oAhjCYrBXbWfxslFRyyTRmxvwCcV1nrLAqLvqfEHA9 DvJbCJo7A3rMCdj+mFdVg9k/E/82Cjr4iPSYN7SaaB1r1eUdKjQD3ja/YYR2iE/3seFZ Ob+QtPdlf5+ghGHdG89P6B6+19wFFIYAD2/IWE+AKRqm3UtAhBLfsNVIMpFWQM5f52MI 07XUlw8SfI4Ei5SH8aWLE6CtHXDA2z0IE98mLERpAkgpT55I3+ixOPn8V/ydX/JMWCv2 W5Sw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=CflOLHFLQdWNJmYL1kxtK+o2KLxLgp4LdJ1CZgep7v4=; fh=V42d4Y/lNDOgZ/9/qsphFBeZCU4sz3YugfOOjBc+1H8=; b=N85VjOhF8TEqBa0+puZIIRyIdKj+uHGMs1QNErgpESOBvk0u4d9lzwRGXCuJARQ7y3 BILo1uH5Xi4TPuG2svXwkbVHXNwinlqT3ESagOCHBlNdQ+z9/hCJBTvRm2GNRPel9Dw2 2zn1J/FvUW4B9wyZWbOPjvruUIeG+Lpbvv1pVzXfLGzVbJwCaLEmrNgJ7XT1pDUcsVAB wJOgh0woQmChJXMb6XSHuB+ujKTNsBsz7ajoVHVaUgrIHhHi7SaDQK2xyWBExxJgKmDw i9gpt+ULTmiwJkE6CMy/gO1e8fOqvUKFDKhThAqZBl8qiCeVEEVwCSzkbEXpigwRv5WN G5bw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-385d9f8dae7si364001fa.1.2026.01.23.00.25.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Jan 2026 00:25:04 -0800 (PST) Received-SPF: pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Received: from debian-zwei.m.ilbers.de ([88.130.203.42]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPA id 60N8P1Xk014977; Fri, 23 Jan 2026 09:25:03 +0100 From: Zhihang Wei To: isar-users@googlegroups.com, felix.moessbauer@siemens.com, amikan@ilbers.de Cc: wzh@ilbers.de, cedric.hombourger@siemens.com Subject: [PATCH v3 05/20] testsuite: handle IMAGE_INSTALL solely in cibuilder.py Date: Fri, 23 Jan 2026 09:24:46 +0100 Message-Id: <20260123082501.240751-6-wzh@ilbers.de> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20260123082501.240751-1-wzh@ilbers.de> References: <20260123082501.240751-1-wzh@ilbers.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.6 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_RP_CERTIFIED,RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,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-Original-Sender: wzh@ilbers.de X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of wzh@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=wzh@ilbers.de 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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: "MOESSBAUER, Felix" By moving the IMAGE_INSTALL parts out of the ci local conf sample, we make this part reusable across tests. By that, tests can easily customize this list without either taking it as-is or completely replacing it. We further get rid of overrides that are not used in the CI anyways. Signed-off-by: Felix Moessbauer --- meta-test/conf/local.conf.sample | 10 ---------- testsuite/cibuilder.py | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample index 092d6ba6..862bea47 100644 --- a/meta-test/conf/local.conf.sample +++ b/meta-test/conf/local.conf.sample @@ -27,16 +27,6 @@ BB_DISKMON_DIRS = "\ MIRRORS ?= "git?://salsa\.debian\.org/debian/.* git://github.com/ilbers/BASENAME" MIRRORS += "https?://cdn\.kernel\.org/.* https://mirrors.edge.kernel.org/PATH" -# The default list of extra packages -IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello isar-disable-apt-cache cowsay example-prebuilt" - -# Container machines don't need example module and enable-fsck. -IMAGE_INSTALL:remove:container-amd64 = "example-module-${KERNEL_NAME} enable-fsck" - -# Machines with secure boot should use signed modules -IMAGE_INSTALL:remove:qemuamd64-sb = "example-module-${KERNEL_NAME}" -IMAGE_INSTALL:append:qemuamd64-sb = " example-module-signed-${KERNEL_NAME}" - # Users and groups USERS += "root" USER_root[password] ??= "$6$rounds=10000$RXeWrnFmkY$DtuS/OmsAS2cCEDo0BF5qQsizIrq6jPgXnwv3PHqREJeKd1sXdHX/ayQtuQWVDHe0KIO0/sVH8dvQm1KthF0d/" diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index d23ba84b..4a181357 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -30,6 +30,18 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '../bitbake/lib')) import bb DEF_VM_TO_SEC = 600 +IMAGE_INSTALL_DEFAULT = [ + 'hello-isar', + 'example-raw', + 'example-module-${KERNEL_NAME}', + 'enable-fsck', + 'isar-exclude-docs', + 'samefile', + 'hello', + 'isar-disable-apt-cache', + 'cowsay', + 'example-prebuilt' +] isar_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..')) backup_prefix = '.ci-backup' @@ -222,6 +234,14 @@ class CIBuilder(Test): f.write('SSTATE_DIR = "%s"\n' % sstate_dir) if image_install is not None: f.write('IMAGE_INSTALL = "%s"\n' % image_install) + else: + if container: + # strip kernel modules from default package install list + _image_install = [p for p in IMAGE_INSTALL_DEFAULT if "-module-" not in p] + else: + _image_install = IMAGE_INSTALL_DEFAULT + f.write('IMAGE_INSTALL = "%s"\n' % ' '.join(_image_install)) + if fail_on_cleanup == '1': f.write('ISAR_FAIL_ON_CLEANUP = "1"\n') if installer_image: