From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a19:675b:0:b0:499:f7ac:14e6 with SMTP id e27-20020a19675b000000b00499f7ac14e6mr6545085lfj.649.1663586463355; Mon, 19 Sep 2022 04:21:03 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:5e7b:0:b0:48b:2227:7787 with SMTP id a27-20020ac25e7b000000b0048b22277787ls646846lfr.3.-pod-prod-gmail; Mon, 19 Sep 2022 04:21:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4TM1EXUQzZ2znhdJJvY+DJN5aOA16SeELZ6YyDtHEYmgo/9QAMPCn4qsX7C5rnGZ6tdnbt X-Received: by 2002:a05:6512:c0f:b0:49b:1e8c:59fd with SMTP id z15-20020a0565120c0f00b0049b1e8c59fdmr5709081lfu.426.1663586462034; Mon, 19 Sep 2022 04:21:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663586462; cv=none; d=google.com; s=arc-20160816; b=kdFGCEkaITC2ftZx9CbgUS7P2yXB4dZm1XS6lKs76tFjMjwgSM6woEg+gdvM3FeVlT WXeF9M7PgMBVyoGdQGJ0WfXyAmIUXdj9DS3RnKwLwkhpXciPrtNQOZ4yPi9kKJnhdC+U sIwVw1xhfi6Awe5B7Rt2lGfVizUlZceVBYEDp2Nem1yM66UGK/HnIaJVNWYi6n/iUrKQ rUjTmbJN+DNwOzIvvP+lu46gI4LUduU+99WacZPdS7ltNqYwjjrFyoQGCG2N8tTmI6FM 694oZcPO10kq9uyllou/aRBNFpxaAc2KtQuJiH9ZcgpButzrQbIpY2bsojKYDN9sIdg6 geIQ== 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=ZwwLKulZdgT6WP0wZi/nFX4vuyjz9hDh+S/vhbQsWWw+nltdUwAB5AyKkMiuP3Z1Gm MH54aGdel8JuGp5uO440O2hxVLeddgvVZbW0jNydX51ygvHrrNeO9SzguMT1uiuR7sfD aH9ldcqr52iNm+otp1znlwaFr6xOjKpFLGbjme4vTaybKcpncAULORVGNyMdyUODjbKs Gb7noFeVNQCdXiS2DCD5Si1Zhn3PUHE3FE1ddvRJ+HaV3WUsvmQH/SL6ZvmyEEHg9O0J 6z+CQ3L5pO8vmYkvT25tW10QOnhw9C18c7aJkw0NSxberSmvpY3elGFaejd7vptD33Ou UYxw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=dJIK8ujM; spf=pass (google.com: domain of fm-72506-2022091911210190939fd2a614d08ded-dznsqv@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-2022091911210190939fd2a614d08ded-DZnSQV@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from mta-65-227.siemens.flowmailer.net (mta-65-227.siemens.flowmailer.net. [185.136.65.227]) by gmr-mx.google.com with ESMTPS id z20-20020a05651c11d400b0026c3d772786si266767ljo.3.2022.09.19.04.21.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Sep 2022 04:21:02 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-2022091911210190939fd2a614d08ded-dznsqv@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) client-ip=185.136.65.227; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=dJIK8ujM; spf=pass (google.com: domain of fm-72506-2022091911210190939fd2a614d08ded-dznsqv@rts-flowmailer.siemens.com designates 185.136.65.227 as permitted sender) smtp.mailfrom=fm-72506-2022091911210190939fd2a614d08ded-DZnSQV@rts-flowmailer.siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: by mta-65-227.siemens.flowmailer.net with ESMTPSA id 2022091911210190939fd2a614d08ded for ; Mon, 19 Sep 2022 13:21:01 +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=dJIK8ujMxw3diwMmt31bjBsNUF61XLa+eg38oK0CohKX54OBsKP0PqFkkrJ2HS6cvKSEOY KPwn9Wj8NAcHR8vCFCDsEnkri2GTATHxLcgmqM9wY2YlauxhcY4YJqYaUmDDvdNROUSRXnDP 4bu+qlI8R3XujT4x6L3CNQW1MQqcg=; From: Felix Moessbauer To: isar-users@googlegroups.com Cc: henning.schild@siemens.com, adriaan.schmidt@siemens.com, jan.kiszka@siemens.com, ibr@ilbers.de, amikan@ilbers.de, Felix Moessbauer Subject: [PATCH v5 4/5] add test for wic partition deploy logic Date: Mon, 19 Sep 2022 13:20:34 +0200 Message-Id: <20220919112035.830233-5-felix.moessbauer@siemens.com> In-Reply-To: <20220919112035.830233-1-felix.moessbauer@siemens.com> References: <20220919112035.830233-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: hi8uSXIrw7Z1 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