From patchwork Tue Mar 11 21:09:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "chris.larson" X-Patchwork-Id: 4089 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Tue, 11 Mar 2025 22:09:59 +0100 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f62.google.com (mail-lf1-f62.google.com [209.85.167.62]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 52BL9wcn017090 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 11 Mar 2025 22:09:58 +0100 Received: by mail-lf1-f62.google.com with SMTP id 2adb3069b0e04-5495851a7a9sf3482496e87.3 for ; Tue, 11 Mar 2025 14:09:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1741727393; cv=pass; d=google.com; s=arc-20240605; b=VxueZ7zN+gB9C34fIKNXsy+VuV7ORHnAolIPEAaVR0sKV8At9pocPNBUSJ1rig6NYy 9ZzscFZ53SKej7GuO78ckOI+2ADoSqJXtCAJyNZU8opqHfAXyeGplHnGO/60utqnI+Q2 c+qPKhxB/nb16Ce0Hvwjx2YjQN7xE5ApDFqWa6iRE4cZinI2iWIYicQBr6lpZ3Y5G+rj sjWl277gaXw3pCva/VludpecD8YmPO3qbhTMT1hFYtGDset/o4eVt2n2aco7Xk3zrAH9 ftSv5t+j3U2LOAluaLRoryz/GpO4Fwl80RWm+i938CNa+CvmB8Fieyx5ZfTIrVW32YJ5 yYLQ== 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=FVcs5JVYiduLHM+xWT8jxSwHA9/RCogH0VOB0ojJa/k=; fh=Hh1Xz/Y0646xelufk1dT5f3OjDIfv2I9j815TG5BMUY=; b=a9DCEEwVL80SYbGpH0Lu17Yz9TQORnbOlhFW0PEYiNyP2FvCbf7dONCDuixjXR1zeA aet0Pa32iXl7speVPYQDO3Xpp+f8urE7HgdQM/xnW8Lpsuyien7L+M5p3LAtVNY7Uuxo ySrh7UR92Pe/9hP3ZKwoFmvIvucMkRExfBmgCJX3ocFh/tW9KYvhUJOeej9b+8qgwzeb wGPKWL2thhdxpuPWYRB3ac/nPeeUcxTp54H6NiKgeb6/yL8vw4q/qsYeeja68mx9vb4L WeLyWvoNARIPhx9ODvCgy3uZYredJemfo70qRn+8EF7OIyeRyRMpkfGZwdsNRFEduoDQ kD8g==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NPeBKYme; spf=pass (google.com: domain of fm-1325773-202503112109481f90be7ac3884bf2db-nhkjgs@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1325773-202503112109481f90be7ac3884bf2db-NHKjgS@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=1741727393; x=1742332193; 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=FVcs5JVYiduLHM+xWT8jxSwHA9/RCogH0VOB0ojJa/k=; b=RIscjmuKypX1BhGidGnZ3EMdIMZTyYdezi6qys55xop4UMxvbFdwZMrj3GIgWvYxgi z+przM3bosqQCuPNGO5Cm5Ew9Z+kyszORpdMMdiORfjOhM6mcNtyQzezVNAFywn2gd3R +nCuzDrnMFDpQRLe39se0IX/3dWdVn5t2qWrG3Qv5FWLNkgqYZVD+StUzSTdRQGwD+og 2jF5Y6m/8undgg2+MkA/9eEUGngCY9jcZMCBWdksDC/c9kgkKAz6xULEyrNhxpx6krc2 FXGVYAK8KDnR6Zd257Z2C2aozR4bm2/omQ/BMAPTsdjyLOPOcLG/2IK0iWtgv6XAvxq/ Z6fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741727393; x=1742332193; 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=FVcs5JVYiduLHM+xWT8jxSwHA9/RCogH0VOB0ojJa/k=; b=DnaDeoZpKzw+8LiQiM3kq6YcP5Tep6T47JPbTExTMxzswz1lKZBQ0VMo/fLaHBil6q kW4oEUMdWQ2z7LicRUfiWqpSORjmT3Tnw1EsZsCB9YhJu+svmEVjkHEhh8RZFKHlGkFn 5DfNiWf/pOOuJIAh6GL12b4BIV3cYIccUeHBaIq4Ye285GM/smg6YpovY32m8d8WMfR0 T8y5U2d2sbwalruV6FmmnSAhlRptuJreziDFzP+//Z0tYHlXAuRuaP59Ov6wVk2ffJ3M 2BHnHi/0/KoLGcWfHFg4Bh9/xyFOnq8TupPMF7ld0D0XPPmJXfd3ofhcUA5vYFLuhKRj GlUA== X-Forwarded-Encrypted: i=2; AJvYcCUS7EjzMTpgZavayveo3bVR9OElEVtouzbN+m+Qm2b5o1SXJLFOfWdRTgZQyGJmu94sySLhH/8=@isar-build.org X-Gm-Message-State: AOJu0Yx20o/g9dpvFBABTwHEf3c1UCI7KbpQEQ055a1adGUilvPKzPcP v/5Yk6BDNVNRxRLxMfYGQGUFAw/UTC0ZRYInBQ01vndtamKI6urw X-Google-Smtp-Source: AGHT+IGYicH/gr+rvR3p9hoVZVj+M809emrTq88z0GLxeefBGdPUPjf0OibN/qrxn/NbhJtrjrkVuQ== X-Received: by 2002:a05:6512:224f:b0:545:381:71e with SMTP id 2adb3069b0e04-54990eb17bbmr6037610e87.40.1741727391286; Tue, 11 Mar 2025 14:09:51 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=Adn5yVG0R4XNy+QmiKVmNtTDhO5z1Rj1fHN6JvtJhxH7DphdFg== Received: by 2002:a2e:8007:0:b0:30b:f8d2:606b with SMTP id 38308e7fff4ca-30bf8d26525ls4069201fa.1.-pod-prod-04-eu; Tue, 11 Mar 2025 14:09:49 -0700 (PDT) X-Received: by 2002:a05:651c:19a1:b0:30b:f24f:d6a5 with SMTP id 38308e7fff4ca-30bf44e1d8dmr65338941fa.3.1741727388882; Tue, 11 Mar 2025 14:09:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1741727388; cv=none; d=google.com; s=arc-20240605; b=EQaFTfEq6G9puPdvfgWfeFLQ3GJjLXI+N0Lauejv6l5e0IodohaZPETXa3MifuN/JB KXRDJBCi4rrwRW4fxY6fotXB++6kcf71Eu8NdJ7clk2YpS2xocrtIE/HibQ3yeHKJTRt 54fiBBYeq3WhDW6xpnKpB5Uoa6RwSOTTyfybGjaBUnFIV/dNsuAhs9pj4Yzg0GLEcoMS lSb4U/5tXD2PLSt3Je2jGh/PLMGoFDtzq01TJwZO9ISqUi4Wj7oof2J6+fCgTeM2AaRe mDuxuwDcy1X0Q+oBKIMsEZpFNE5csYXl9NGOQVtTlzrPZYpVmyPtbqWYyG2WWbaVK7wF 7zIA== 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=8deoDiVndOuNd+6cuGxSG++xxi/mmaTPlUVzZHAmUYM=; fh=bxwHoRtzgcBE20fsluyIAvpVkk49eQhu61r0Hn3s3Yc=; b=I480emKzpKR6M4qWNcMlTgajXqeeCyFdt23lLddJtgfKTIp4rQ+3tPIWfAmCc2FUK3 mkqBOX5BMPT/S1dzqkjAte8Kx3KSTyKYZYViZItBDqgz0PZKGDBua80BAgqdXQXqvoF7 3AGulOLGM7cVWd4E999J3/a82M4Wtu+tydZpZHcjY4Ku/xVyfeEcLyvpcwMFgzs6scL1 LkT/QTlwKFHDrZPfmAem4ipt869ATtHxxMTmeXxMSmxpfjJ6lQJxNwht1K5gca6PSuiN zOXyJxbvtSiiC5zjspuE9hj9HIzaPeBhOL/VDleM7qKSH/FhZln7xKol/zJyvn6FQ3/t eUAw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=NPeBKYme; spf=pass (google.com: domain of fm-1325773-202503112109481f90be7ac3884bf2db-nhkjgs@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1325773-202503112109481f90be7ac3884bf2db-NHKjgS@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-65-228.siemens.flowmailer.net (mta-65-228.siemens.flowmailer.net. [185.136.65.228]) by gmr-mx.google.com with ESMTPS id 38308e7fff4ca-30be99c911dsi2464761fa.5.2025.03.11.14.09.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Mar 2025 14:09:48 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1325773-202503112109481f90be7ac3884bf2db-nhkjgs@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) client-ip=185.136.65.228; Received: by mta-65-228.siemens.flowmailer.net with ESMTPSA id 202503112109481f90be7ac3884bf2db for ; Tue, 11 Mar 2025 22:09:48 +0100 X-Patchwork-Original-From: "chris.larson via isar-users" From: "chris.larson" To: isar-users@googlegroups.com Cc: Cedric Hombourger , Christopher Larson Subject: [PATCH 3/3] testsuite: add 'customizations' test Date: Tue, 11 Mar 2025 14:09:38 -0700 Message-ID: <20250311210939.4090-4-chris.larson@siemens.com> In-Reply-To: <20250311210939.4090-1-chris.larson@siemens.com> References: <20250311210939.4090-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=fm1 header.b=NPeBKYme; spf=pass (google.com: domain of fm-1325773-202503112109481f90be7ac3884bf2db-nhkjgs@rts-flowmailer.siemens.com designates 185.136.65.228 as permitted sender) smtp.mailfrom=fm-1325773-202503112109481f90be7ac3884bf2db-NHKjgS@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 test builds isar-image-ci with the hostname customization enabled, and verifies that the customization applied correctly. Signed-off-by: Christopher Larson --- testsuite/cibuilder.py | 9 +++++++++ testsuite/citest.py | 21 +++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index b5b6a093..1746171e 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -109,6 +109,7 @@ def configure( source_date_epoch=None, use_apt_snapshot=False, image_install=None, + customizations=None, **kwargs, ): # write configuration file and set bitbake_args @@ -155,6 +156,7 @@ def configure( f" sstate_dir = {sstate_dir}\n" f" ccache_dir = {ccache_dir}\n" f" image_install = {image_install}\n" + f" customizations = {customizations}\n" f"===================================================" ) @@ -216,6 +218,13 @@ def configure( f.write('IMAGE_INSTALL = "%s"\n' % image_install) if fail_on_cleanup == '1': f.write('ISAR_FAIL_ON_CLEANUP = "1"\n') + if customizations is not None: + if not isinstance(customizations, str): + customizations = ' '.join(customizations) + f.write('CUSTOMIZATIONS = "%s"\n' % customizations) + 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') # include ci_build.conf in local.conf with open(self.build_dir + '/conf/local.conf', 'r+') as f: diff --git a/testsuite/citest.py b/testsuite/citest.py index 47f49263..66b39334 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -345,6 +345,27 @@ def test_container_sdk(self): ) +class CustomizationsTest(CIBaseTest): + """ + Test image customizations using the hostname-customizations package. + + :avocado: tags=customizations,single,full + """ + + def test_single_customization(self): + self.init() + machine = self.params.get("machine", default="qemuamd64") + distro = self.params.get("distro", default="bullseye") + + self.perform_build_test("mc:%s-%s:%s" % (machine, distro, "isar-image-ci"), customizations="hostname", image_install="") + self.vm_start( + machine.removeprefix('qemu'), + distro, + image="isar-image-ci", + cmd="hostname | grep isar-ci" + ) + + class SignatureTest(CIBaseTest): """