From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a5d:64e5:0:b0:22a:43a7:b9df with SMTP id g5-20020a5d64e5000000b0022a43a7b9dfmr16602291wri.79.1663745663428; Wed, 21 Sep 2022 00:34:23 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:5123:b0:3b4:76ca:bee3 with SMTP id o35-20020a05600c512300b003b476cabee3ls4546495wms.0.-pod-canary-gmail; Wed, 21 Sep 2022 00:34:22 -0700 (PDT) X-Google-Smtp-Source: AMsMyM52TQEJhKkz/vYXelSbIyctFmfN7X2Zr0dS0MRNY55S+KyFTqvblelePvhTuO8Z/ODIdSLa X-Received: by 2002:a05:600c:2142:b0:3b4:92b6:73ba with SMTP id v2-20020a05600c214200b003b492b673bamr5005710wml.139.1663745662104; Wed, 21 Sep 2022 00:34:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663745662; cv=none; d=google.com; s=arc-20160816; b=XxeaNOeOqpyrfc6ADlW0vBtlVqDQpRV3xTm8lNQDSt8Hf7mol37nk9s1bBN9tVKD/O wmD7Lb8oZ446cNeAQmhdUswZu5DqjXbeB7sixRdR/8sFMDq5ZWzG3tPgtNllcUa8GUg/ ONbonRmobH8iG3MzTcotb7FP2TO3xMPMdYFWfEqKdB1x5kVFMdy+4vAtPn06drcqpOtQ h0q8fFIoWQFFFiz5vB9S8Tndp87f2R6Z0B+2FHDGWth0t9OZFpR5KduVWLWfJ4bPHGlF zxLCkHRB+bSnFh36N6vcGT2DbYuAQmRRyWBit4d3NScTPZ0VKF9LHIO3+zD4iXDNl97d GgTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=YXm/nWBt9WWEOf0AAiPpPXMjYBaDVhtWBhyfg3tCdEY=; b=IHvLSeHAfFgvIpi5EVukdmVWmeLNBCoK7K8XbEJVXxE0EdvapG0+w0+vhXTHyimX3F XCb8vbV0n8yabgcHapIuoHx2JOZFT9mz1lUK7h+rGG1kP+gRCcmKQPwiRnVj/AbN61sM OOHdtlmInhoFzk9CrqrLJt5nQ++FQzVyNQqMOYoTv7/jcR+5+6c8oKsB4EwKD0Ch9Cex FsLmlNWTDu55SqhY2fonzO2uXOosoPxqzPK4n3LYkQHU44iaigzPNt/Y3+VI/R3HvHHa gdQ51BZgsdpcswFuVmivukmpN1Uzo9Op91+lVmBebsXQ4UggBgHVhkzR3aqvr3XGgPE5 X4Dg== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=i18tkI9+; spf=pass (google.com: domain of fm-72506-202209210734219ca5287268d162416f-gr0stp@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-202209210734219ca5287268d162416f-Gr0StP@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: 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 az12-20020a05600c600c00b003b499f88f7esi102540wmb.1.2022.09.21.00.34.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Sep 2022 00:34:22 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-202209210734219ca5287268d162416f-gr0stp@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=i18tkI9+; spf=pass (google.com: domain of fm-72506-202209210734219ca5287268d162416f-gr0stp@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-202209210734219ca5287268d162416f-Gr0StP@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 202209210734219ca5287268d162416f for ; Wed, 21 Sep 2022 09:34:22 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=felix.moessbauer@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=YXm/nWBt9WWEOf0AAiPpPXMjYBaDVhtWBhyfg3tCdEY=; b=i18tkI9+0I4o+fIju42ML6KysBmqpoRZw/XyvvBOZfBigM+vcglNJLW1ur9ZKGXdQaNoZR SHwPD+wG8U5VQdCu6uungPvzvByd/ApBF+JI2J/dBabrZcEgAc7yvTXZszNZ14789Q56+4GQ FxCw62NLosecHWnAatGyxhjZymZAU=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, jan.kiszka@siemens.com, ibr@ilbers.de, amikan@ilbers.de, adriaan.schmidt@siemens.com, Felix Moessbauer Subject: [PATCH v6 5/6] add test for wic partition deploy logic Date: Wed, 21 Sep 2022 09:33:47 +0200 Message-Id: <20220921073348.169965-6-felix.moessbauer@siemens.com> In-Reply-To: <20220921073348.169965-1-felix.moessbauer@siemens.com> References: <20220921073348.169965-1-felix.moessbauer@siemens.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-72506:519-21489:flowmailer X-TUID: 07JL5gVW+KTl This patch adds tests to check if the wic partition files are copied to the deploydir if requested. Signed-off-by: Felix Moessbauer --- testsuite/cibase.py | 10 ++++++++++ testsuite/cibuilder.py | 5 ++++- testsuite/citest.py | 23 +++++++++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/testsuite/cibase.py b/testsuite/cibase.py index 722d7bd2..6239b4de 100755 --- a/testsuite/cibase.py +++ b/testsuite/cibase.py @@ -17,6 +17,16 @@ class CIBaseTest(CIBuilder): self.bitbake(targets, **kwargs) + def perform_wic_partition_test(self, targets, wic_deploy_parts, **kwargs): + self.configure(wic_deploy_parts=wic_deploy_parts, **kwargs) + self.bitbake(targets, **kwargs) + + partition_files = set(glob.glob(f'{self.build_dir}/tmp/deploy/images/*/*.wic.p1')) + if wic_deploy_parts and len(partition_files) == 0: + self.fail('Found raw wic partitions in DEPLOY_DIR') + if not wic_deploy_parts and len(partition_files) != 0: + self.fail('Did not find raw wic partitions in DEPLOY_DIR') + def perform_repro_test(self, targets, signed=False, **kwargs): gpg_pub_key = os.path.dirname(__file__) + '/keys/base-apt/test_pub.key' gpg_priv_key = os.path.dirname(__file__) + '/keys/base-apt/test_priv.key' diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py index dfb0a376..d5c83b22 100755 --- a/testsuite/cibuilder.py +++ b/testsuite/cibuilder.py @@ -54,7 +54,7 @@ class CIBuilder(Test): def configure(self, compat_arch=True, cross=None, debsrc_cache=False, container=False, ccache=False, sstate=False, offline=False, - gpg_pub_key=None, **kwargs): + gpg_pub_key=None, wic_deploy_parts=False, **kwargs): # write configuration file and set bitbake_args # can run multiple times per test case self.check_init() @@ -77,6 +77,7 @@ class CIBuilder(Test): f' ccache = {ccache}\n' f' sstate = {sstate}\n' f' gpg_pub_key = {gpg_pub_key}\n' + f' wic_deploy_parts = {wic_deploy_parts}\n' f'===================================================') # determine bitbake_args @@ -105,6 +106,8 @@ class CIBuilder(Test): f.write('IMAGE_INSTALL_remove = "example-module-${KERNEL_NAME} enable-fsck"\n') if gpg_pub_key: f.write('BASE_REPO_KEY="file://' + gpg_pub_key + '"\n') + if wic_deploy_parts: + f.write('WIC_DEPLOY_PARTITIONS = "1"\n') if distro_apt_premir: f.write('DISTRO_APT_PREMIRRORS = "%s"\n' % distro_apt_premir) if ccache: diff --git a/testsuite/citest.py b/testsuite/citest.py index 6c8eb26e..8381f21c 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -223,6 +223,29 @@ class RebuildTest(CIBaseTest): finally: self.restorefile(dpkgbase_file) +class WicTest(CIBaseTest): + + """ + Test creation of wic images + + :avocado: tags=wic,full + """ + def test_wic_nodeploy_partitions(self): + targets = ['mc:qemuarm64-bookworm:isar-image-base'] + + self.init() + self.delete_from_build_dir('tmp') + self.perform_wic_partition_test(targets, + wic_deploy_parts=False, debsrc_cache=True, compat_arch=False) + + def test_wic_deploy_partitions(self): + targets = ['mc:qemuarm64-bookworm:isar-image-base'] + + self.init() + # reuse artifacts + self.perform_wic_partition_test(targets, + wic_deploy_parts=True, debsrc_cache=True, compat_arch=False) + class ContainerImageTest(CIBaseTest): """ -- 2.30.2