From patchwork Fri Apr 11 20:08:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Larson X-Patchwork-Id: 4171 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 11 Apr 2025 22:09:41 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-wm1-f61.google.com (mail-wm1-f61.google.com [209.85.128.61]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 53BK9d7a019793 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 11 Apr 2025 22:09:40 +0200 Received: by mail-wm1-f61.google.com with SMTP id 5b1f17b1804b1-43ced8c2eb7sf19490635e9.1 for ; Fri, 11 Apr 2025 13:09:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744402174; cv=pass; d=google.com; s=arc-20240605; b=BXTxz2N4M0aQZpnKRQnHQdCLDSbTREnCzxcGcYs/7Cb3b1OHuZVJpV/CY5JWdg+e0Z 8oZ9gMoRsZGO1FNTq/oBc5pJDQ+3CnN1f6KlWdnnLtIuq0tH146lU0syIh1YDbmkGiD/ Pu6Q8mRX5jAav7l2Fkdxk1sgUrZi1FWBQVIurKPzSJicuMtiow0O16RRy9A0LTBqU+XA sl0ZmBh9XXjrkBl/1sxYbNrlXk+qIMxs87P0yTsaIF8a2tSu1BcPLbg10S/C2BgxtS3m Vg/n4T9FziJzgleL43Ng9Ie7072UmbTcUzL0TtBMT00vvPLJBG0CC7Ld1znM0iVTFOvj BUXQ== 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:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Y98V8IB2P6rB4EH1dIbzGA2cGwp57DPZe9ZIsvLg0LE=; fh=CbWcU8gHErh2waLBTBrYbrLIZezcPYz/FlRo+MMDo94=; b=PcBi8CqHoDk24bzQXT4s9VJaN66N59pGyXJ+aCFmz1od0LiVvILek/0MQhdYd9rTBK jigjnYLwMuW79A6nEMenSJM8QRNKFH9NzegB98ZSCirq0czrAFe8/Gv99l3B5SmeIR83 PZczheFVROhl1VSEZxC9+SpxULXLa3R6snMeEPdvIkMpr1iYwsTyyyLWPGPjvIIlUXk8 p2IBupeKfR3QRhtqpa9dcvjB+BVlGtbZXcmFb4drthlBKmZ3uQJgcrldV/0GYPN6jJEI o13P7JgX/ouJUDioi35v2Iw9rMmKklbVb/2gsIaZklDbx5bu0XY91iRq4puYESlFtuIc 3ejw==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=U9EK+6us; spf=pass (google.com: domain of fm-1325773-20250411200931d2236d4aeff92605df-7lmzyt@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1325773-20250411200931d2236d4aeff92605df-7LMzYT@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1744402174; x=1745006974; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=Y98V8IB2P6rB4EH1dIbzGA2cGwp57DPZe9ZIsvLg0LE=; b=HhH6MnBYgXJZOTgLpf7vRVbjfJWWUJvRpDNtRUDMFgDm3WKeZCctHTX49HmCifAS9b mHgdkqPXVoroh1VGchJo5ovRZdaEwIDBu05DfOOVLqET2JFSRujJ6AZLbfSKgj/QE7ZC jzK30Cv4ce6KbDS4Z0b0fpnk8bAWcrd3ETwYVf9bfwrCcYF/ycyFC29YGSB7CekxPrLZ ME/dGXqtnZbAY7V+GgyVpE+6boS+yqUT56F0v1eaRMR0PfZ94IpqAR9yMsKUS7gnRa5Y fpQdFucWqBn0c/hB6+u/bZwPLi84TOTV8c02To08WfBlmCLXSazXJgBDt2dOs5wDct05 Rs1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744402174; x=1745006974; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=Y98V8IB2P6rB4EH1dIbzGA2cGwp57DPZe9ZIsvLg0LE=; b=u7ysQYKM/uHo+g/UDdbCXhbqKurKiuLnH6MGPqsybM1rvWqYKsN0YgsWhRfKFkb2sf dLDbk3At7Gxx2Kr7NdMfB3Elhslsr+8Wr4f2Ei+uV4Tz3HUTZWBAgZoaPPSZ4Tgisk0G o/oMRFwSQaktHj7KUMfakUP2fqDhZV4+da2hX+ivnPC+U7gZ6KEHSE4HSu+woMYzZ+eL 8R8Q+iOgfXIsZpGiln5qGnPc3Ow6oxUpCCIpeJb+WL4W1iBsR2VqjygDaVU1r8SkZD8N tZFM56ceJh2f2l5j9ikIMLgxIf6ZDgJKPZQBbNfMRvBwW5U2cHROCvyGaKUggwVkBldF uqXA== X-Forwarded-Encrypted: i=2; AJvYcCWPLnieS3Njr716emlZA5TCv9nrPMfyIQG5lb7VDOZjUCOj56meSR6+YllgCO3B0TY5dueOpRo=@isar-build.org X-Gm-Message-State: AOJu0YwiSGp1lpUeizukEmo8G/hjeYmMVsHtXN2lEQhfjFUaBiTRngxR 1JB8Yebuo2qLhaDg9xR+51AtEbg7weIDpolWK3tWjDD9nvUSM41d X-Google-Smtp-Source: AGHT+IGoOH7lHOLNjXN7Aj71qmq5YB+EOUSBcdmp9dJd/SEDPlTnXMmKoQoSylGUINKNqqH9zQKfCQ== X-Received: by 2002:a05:600c:a13:b0:43c:fbbf:7bf1 with SMTP id 5b1f17b1804b1-43f3a9bef0cmr42319295e9.30.1744402174025; Fri, 11 Apr 2025 13:09:34 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAKoMPz1l3Jj5ogD9GcGJqeWap/owST40gPmrUomMrfvZg== Received: by 2002:a05:600c:5113:b0:43c:edda:8108 with SMTP id 5b1f17b1804b1-43f2c50efe9ls11984215e9.1.-pod-prod-07-eu; Fri, 11 Apr 2025 13:09:32 -0700 (PDT) X-Received: by 2002:a05:600c:a13:b0:43c:fbbf:7bf1 with SMTP id 5b1f17b1804b1-43f3a9bef0cmr42318445e9.30.1744402171749; Fri, 11 Apr 2025 13:09:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744402171; cv=none; d=google.com; s=arc-20240605; b=h9I7QoXEP3VU5YUx+0BCGThqDnsugfpSZ1LD20mbQ5d+pdoqjpCEZ3MSF4AFWAEFYl dLshMCszTPQ31FcNyP93Qyy48lIfENe7WuNb+/4WOzgWQArd1XXkHFfj7YVhIMoX/yuL lrF8ZD855yd4mEFwxjj0yxOSpolh9x76+GrgKeunWo5FeASAYAbyLzc/oO6MhAYXIqoR W2jPDM0tAbQ49X3D07C/q2ZuZJHz7lSnRw6KDPtjejX1gZoyXfoZMBr/VGjmaQpg1lQp lZ9LrOKsJrPRw5ZkqD12GETo+CQR6Ef3a/bjJtV95otGTu/O8scbJ51CTsUq6l9tkpdn BddA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=gI6eCU8XGv28sADuOPMJIukSNiRxX/XoJ5dVFQl98lc=; fh=bxwHoRtzgcBE20fsluyIAvpVkk49eQhu61r0Hn3s3Yc=; b=F/4tPMv+Y0dJ9b4T4GAyO6OE6V4iwA9SahNPGW8Gze5OqVbSA6R66kPufOX84S5IZo 4+k/owJhYqO6h43M6r2FpdOTeVp0+8qJAkRmkeTBhMgLIMcrJtNu31CCPfu6Q30Nta/w F4gFrYh0EqYGXWWHwdg80bxBpaIurnBVcPvHH86IZQznz9blxhJmCWbuUAhJ8s77BB0b mHE/evBg6js93VuVUtZLnU+gcjwhV8GTxfrbvGnOUX21dnM9glZfEySkR81JvQjFgKg9 EqtAYxm78rsI3WxnRiwYtPsWugdpqSRTYD62kMlB1Z0NAESoMOxWZGGckgut2KSIB0OZ matA==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=U9EK+6us; spf=pass (google.com: domain of fm-1325773-20250411200931d2236d4aeff92605df-7lmzyt@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1325773-20250411200931d2236d4aeff92605df-7LMzYT@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id 5b1f17b1804b1-43f204c3ed7si1805845e9.0.2025.04.11.13.09.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Apr 2025 13:09:31 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1325773-20250411200931d2236d4aeff92605df-7lmzyt@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20250411200931d2236d4aeff92605df for ; Fri, 11 Apr 2025 22:09:31 +0200 X-Patchwork-Original-From: "chris.larson via isar-users" From: Christopher Larson To: isar-users@googlegroups.com Cc: Cedric Hombourger , Christopher Larson Subject: [PATCH 3/4] testsuite: add 'extra_lines' argument to configure Date: Fri, 11 Apr 2025 13:08:51 -0700 Message-ID: <20250411200852.51967-4-chris.larson@siemens.com> In-Reply-To: <20250411200852.51967-1-chris.larson@siemens.com> References: <20250411200852.51967-1-chris.larson@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1325773:519-21489:flowmailer X-Original-Sender: chris.larson@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=U9EK+6us; spf=pass (google.com: domain of fm-1325773-20250411200931d2236d4aeff92605df-7lmzyt@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-1325773-20250411200931d2236d4aeff92605df-7LMzYT@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: chris.larson@siemens.com Reply-To: chris.larson@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=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= From: Christopher Larson This allows us to add extra lines to the configuration file, which is generally useful, and will ease future creation of tests by avoiding the need to add new arguments to the configure function for each configuration needed. Signed-off-by: Christopher Larson --- testsuite/cibuilder.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index e726ba87..f47d6a77 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -114,6 +114,7 @@ def configure( installer_distro=None, installer_device=None, customizations=None, + lines=None, **kwargs, ): # write configuration file and set bitbake_args @@ -142,6 +143,7 @@ def configure( distro_apt_premir = os.getenv('DISTRO_APT_PREMIRRORS') fail_on_cleanup = os.getenv('ISAR_FAIL_ON_CLEANUP') + strlines = None if lines is None else '\\n'.join(lines) self.log.info( f"===================================================\n" f"Configuring build_dir {self.build_dir}\n" @@ -162,6 +164,7 @@ def configure( f" image_install = {image_install}\n" f" installer_image = {installer_image}\n" f" customizations = {customizations}\n" + f" lines = {strlines}\n" f"===================================================" ) @@ -248,6 +251,8 @@ def configure( f.write('CUSTOMIZATION_VARS:append = " ${IMAGE}"\n') f.write('CUSTOMIZATION_FOR_IMAGES:append = " isar-image-ci"\n') f.write('HOSTNAME:isar-image-ci = "isar-ci"\n') + if lines is not None: + f.writelines((line + '\n' if not line.endswith('\n') else line) for line in lines) # include ci_build.conf in local.conf with open(self.build_dir + '/conf/local.conf', 'r+') as f: