From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7142858516907163648 X-Received: by 2002:a05:6512:401c:b0:49f:4b2e:7153 with SMTP id br28-20020a056512401c00b0049f4b2e7153mr10195980lfb.443.1664272345211; Tue, 27 Sep 2022 02:52:25 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:46da:0:b0:48b:2227:7787 with SMTP id p26-20020ac246da000000b0048b22277787ls377004lfo.3.-pod-prod-gmail; Tue, 27 Sep 2022 02:52:23 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5UNdypHO3pVnHHJ3ZfX5HC2CUInieZoKwep2TyV1MF3J9nr2gzj0IWRytNDrO6WnxwwNCp X-Received: by 2002:a05:6512:a93:b0:49f:d52f:5d14 with SMTP id m19-20020a0565120a9300b0049fd52f5d14mr11768890lfu.359.1664272343843; Tue, 27 Sep 2022 02:52:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664272343; cv=none; d=google.com; s=arc-20160816; b=qSlkVTcnuPI6LJbQDlJ7HyAZoVNwuBGicBrjmfAVikXoeBpCd6xH/QTFj1ALlS7T1X 0P/mbMlAFCitGIB7CCBFcU7iHA22petsZoqd+xL3MTC+fcP4fclKGlKkvl8mJXKZaeO1 tf66xh4iWghmQQMND6xP/oeXu3VVDiGmoJrnFtiVErL3X6zjfXpySFs8XXajDyZTuvF/ qbj9U/seumnT4LWFxik5ca00yuRfxoI4kAFqGa/FKBO0qHDmiTVdvumTG1aNzQtp1QDh rMF0xxI219CHR2GOk4pcao6g6EYHjfnIXmwltqgxwGIerfcrK3rvJjfMtpxlK0UQJNQS 5Jow== 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=tNZspFlmmDV0xTpMKLzI74NbIwGqrtMmguHEmErgCbg=; b=V0W1niGTe6qQDUSExA+kmfuto6HdDcdVvOczIhki4f5wkMEQ11tLP95dXZCZ2QnNAH lL/nUOk1OXSpp6T1b3zLcVA5yc/0bslXrCi64pf+nf9pbusAJel+FD5y60JtofSVkiPV f1Op+jSNRbboI2K+1PD0wCG1fOH95FWHc1tCdUCV9jeg+cFEnigl8AehoCKgLJ1ZW3SN Q2GLEF4qXCBPzqmJPpS+2EroN9i9rqHd6MCd/CAMamoyFVrA5UUwdz0I/pwIXPMFU+/Z vOq27Wum4CGcjNPvZaEQpmvxyDk92pX93Rt4Z7WEdyZ6OHHQL/DmHdfi0CHpNA1IX4s2 SRaQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=an6ahxe5; spf=pass (google.com: domain of fm-72506-20220927095223dc86b9913f643c102c-dmmk_a@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-20220927095223dc86b9913f643c102c-dMMk_A@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 j15-20020a056512108f00b0048b38f379d7si38462lfg.0.2022.09.27.02.52.23 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Sep 2022 02:52:23 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-72506-20220927095223dc86b9913f643c102c-dmmk_a@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=an6ahxe5; spf=pass (google.com: domain of fm-72506-20220927095223dc86b9913f643c102c-dmmk_a@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-72506-20220927095223dc86b9913f643c102c-dMMk_A@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 20220927095223dc86b9913f643c102c for ; Tue, 27 Sep 2022 11:52:23 +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=tNZspFlmmDV0xTpMKLzI74NbIwGqrtMmguHEmErgCbg=; b=an6ahxe5dL9NIu9jdbGc7VNNHQMJWHIfdHZpiZrTyghaU3YInuLwjQTEN5r7+R77zkxI+m 7dsTQD9XM6iJVEY1YLaRxtAntGsGayLlvwtS52WQPpWujdoLO2q9tshPAmIlhWBSoYjIyNti tVZNwwM3MsLIN/K9Md7pZ4P2WIo74=; 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 v7 5/6] add test for wic partition deploy logic Date: Tue, 27 Sep 2022 11:51:16 +0200 Message-Id: <20220927095117.958474-6-felix.moessbauer@siemens.com> In-Reply-To: <20220927095117.958474-1-felix.moessbauer@siemens.com> References: <20220927095117.958474-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: kWs21bEfG5VQ 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..e8cc299e 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -318,3 +318,26 @@ class VmBootTestFull(CIBaseTest): def test_amd64_focal(self): self.init() self.vm_start('amd64','focal') + +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) -- 2.30.2