From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a4a:d241:0:b0:555:7682:7644 with SMTP id e1-20020a4ad241000000b0055576827644mr4730190oos.2.1686553985464; Mon, 12 Jun 2023 00:13:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a4a:a444:0:b0:555:458b:d30d with SMTP id w4-20020a4aa444000000b00555458bd30dls1098430ool.0.-pod-prod-05-us; Mon, 12 Jun 2023 00:13:04 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7BLJHKcKyFv3bv2Ea7NzH0Ryt1Rfu1xEInlCxtKVZFY1WJRI83CmwGckfj6zO7vHaiZrct X-Received: by 2002:a05:6808:547:b0:398:58c5:b853 with SMTP id i7-20020a056808054700b0039858c5b853mr3886577oig.47.1686553984798; Mon, 12 Jun 2023 00:13:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686553984; cv=none; d=google.com; s=arc-20160816; b=zScSPp/FBjVcxlC7341VBwBRKbsTY+BN5hO9ah6utnX4b3qt1VDRvbbrl7qPjECVPI b5A9MNPMOw44HnfNEsCK2v0rvDxSf1yivOgpRVs48q4wXspIe/LDkBBHjEOdT8vzY1s+ O8ypbgjRKXqKUcll0o6sbfULOJXDZLJE3ZdS++CLakp4bK6LatEDZEfbhDBltH5DqChm gy93fdy5jtyHmf75G6KUM04XWaGeaEwaVJMdW+wEOMgdAemHV+LgM3PBcGE+BI0SIeuE PT+kToh2RoyEqSQ7YODNvgeEPLcm+fiZhS47iVClEXj+8Vg3lE5dWD+gw/q5dIjwEM2C z2Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=c/m/MYkRCfGROJU5DaIGEfmXalmFkVqp1bB4wO8s7zU=; b=PsPqfX5aVQIqUB0Vo2hW3gjjOYsNECEdjhPW6jLqB7pbu0De/D9XU7d9ftgz7S5IVo RpIRYxxaher1ONYQ+S7jjprdOsy0qHrtXrSgdsgoBWBy9aew6xjv9/lvKREHOnT38Pi5 yqJbLY40pgNuvC1uqqh4fAtFec+aZWjf5mJVB7IXpCt29FOH6Z6n6peZk8Y2MI8p8o75 VZfDOZeu3TVc+Eh3QpBMzp8YpVE8nfxDbM2f+w6/688QjIjF8zwkaHAizS646Ida40AX jJxn2nz2r6yz6mopVLZhji65ssKQmUO8j3NyQEXn+dOe56TYsDsAcqZrUNyTJUMGjO2A jUdg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id p3-20020a17090adf8300b00256a4e5f073si988932pjv.2.2023.06.12.00.13.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jun 2023 00:13:04 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 35C7Cucn007465 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 12 Jun 2023 09:12:59 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 07/10] CI: Move qemuarm64-bookworm hacks to CI layer Date: Mon, 12 Jun 2023 09:12:53 +0200 Message-Id: <20230612071256.8688-8-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230612071256.8688-1-ubely@ilbers.de> References: <20230612071256.8688-1-ubely@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: RRD30IY3LWQO From: Anton Mikanovich To enable setting CI-related config in testsuite only move it from meta-isar to meta-test layer. Also change testsuite to use new image. Signed-off-by: Anton Mikanovich --- meta-isar/conf/multiconfig/qemuarm64-bookworm.conf | 3 --- meta-test/recipes-ci/images/isar-image-ci.bb | 4 ++++ testsuite/citest.py | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf index 714e4d73..c6b92d2e 100644 --- a/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf +++ b/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf @@ -4,6 +4,3 @@ MACHINE ?= "qemuarm64" DISTRO ?= "debian-bookworm" - -IMAGE_FSTYPES:append = " wic.xz" -IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}" diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index b101c2c2..92bb2ba9 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -43,3 +43,7 @@ IMAGE_FSTYPES:append:qemuarm:debian-bookworm ?= " wic" WKS_FILE:qemuarm:debian-bookworm ?= "sdimage-efi-sd" IMAGE_INSTALL:append:qemuarm:debian-bookworm ?= " expand-on-first-boot" IMAGER_INSTALL:append:qemuarm:debian-bookworm ?= " ${SYSTEMD_BOOTLOADER_INSTALL}" + +# qemuarm64-bookworm +IMAGE_FSTYPES:append:qemuarm64:debian-bookworm ?= " wic.xz" +IMAGER_INSTALL:append:qemuarm64:debian-bookworm ?= " ${GRUB_BOOTLOADER_INSTALL}" diff --git a/testsuite/citest.py b/testsuite/citest.py index 779d86e2..d49c5c8e 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -158,7 +158,7 @@ class CrossTest(CIBaseTest): def test_cross_bookworm(self): targets = [ 'mc:qemuarm-bookworm:isar-image-ci', - 'mc:qemuarm64-bookworm:isar-image-base' + 'mc:qemuarm64-bookworm:isar-image-ci' ] self.init() @@ -175,7 +175,7 @@ class WicTest(CIBaseTest): :avocado: tags=wic,full """ def test_wic_nodeploy_partitions(self): - targets = ['mc:qemuarm64-bookworm:isar-image-base'] + targets = ['mc:qemuarm64-bookworm:isar-image-ci'] self.init() self.delete_from_build_dir('tmp') @@ -183,7 +183,7 @@ class WicTest(CIBaseTest): wic_deploy_parts=False, debsrc_cache=True, compat_arch=False) def test_wic_deploy_partitions(self): - targets = ['mc:qemuarm64-bookworm:isar-image-base'] + targets = ['mc:qemuarm64-bookworm:isar-image-ci'] self.init() # reuse artifacts -- 2.20.1