From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7239976793797558272 X-Received: by 2002:a05:6870:487:b0:192:7f20:4665 with SMTP id t7-20020a056870048700b001927f204665mr1141596oam.13.1685688457873; Thu, 01 Jun 2023 23:47:37 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6820:8c2:b0:550:17c5:4fe0 with SMTP id bi2-20020a05682008c200b0055017c54fe0ls972620oob.1.-pod-prod-07-us; Thu, 01 Jun 2023 23:47:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ401AwucU7souD+Q4FHGdS79dZrNkBMjaFTDi+QjstKsf2xFMsIJvv24zFkbAXg3p2VA3OB X-Received: by 2002:a05:6358:2812:b0:123:5664:e493 with SMTP id k18-20020a056358281200b001235664e493mr9355773rwb.27.1685688457274; Thu, 01 Jun 2023 23:47:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685688457; cv=none; d=google.com; s=arc-20160816; b=OIDtYDSiXoYbJBIDvTAYyiJTxZgTWMWOBvBAm1442GvkzkC/Yvc5f542HtGh7YBJ8+ HI+d26p6yiJK/Jm/1dzQNOvmLo3sNbOD0gfrI4Irg1EhPHIyzqkLoHQ5Mp94EbEoxh10 cqZcK+PFjoXQC3SajHnqSJ8fHF+/BNyklMXjlCR4ckG5seBlh3WGFBtWHjgNx0JgEWf8 WWzUwhv0YVJutuw70F1T+TCJdMoIsNh8JLjEZWrELf/gm5ZFe7HbeL4L6ac7iReZWGFl d3bMAAWtVR7izEvUX6b9gyWSXfyy4JxLp+P5L3vpaAPHKAosJ1GEFd3LVwvpbNEFIr/5 Ic1w== 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=NqG915xv46E+vDBECr9cDlnENjcAHDgvFy2cybFJdgg=; b=VEYcUuDwyE03Ia0g6pS0+PEsqU6npRPcnBG4oOTYF5BMCyNndfHHmR0RmpkbLtZu9G Tu+MeFVz1yOS0narwudUzqGoX2lf5isfoja8/6GxFpkMouyKk6vHnfbXxFFUVvY1A64q qRYsg7ABMIjrkMK21oKCw64cwq8AEfFw/4GHkVHLJEacabWUsUZVEN3UvcLbgJ5MufPX gSvAtiXqDNVLBgz8Og60juVMLKweG+72zQ9XHWY+yCRb0c6OEElfTn/algsni7A8RUx+ 2rVnJI6boes4OZ5yRK6DlK7O4sV2v6ilofUb9bx4sRh0scSUznCNIDcaev6pUZos2CVZ JqKA== 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 h4-20020a17090acf0400b00252ad81ba3asi562621pju.1.2023.06.01.23.47.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Jun 2023 23:47:37 -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 3526lTcw003460 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 2 Jun 2023 08:47:32 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 07/10] CI: Move qemuarm64-bookworm hacks to CI layer Date: Fri, 2 Jun 2023 08:47:26 +0200 Message-Id: <20230602064729.10331-8-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230602064729.10331-1-ubely@ilbers.de> References: <20230602064729.10331-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: g99nbucQIYl2 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 6fd397d3..09c8dd24 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -41,3 +41,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