From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:ad4:5966:0:b0:629:58a7:9a98 with SMTP id eq6-20020ad45966000000b0062958a79a98mr12632989qvb.53.1687241150073; Mon, 19 Jun 2023 23:05:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:9a7:b0:623:8bf3:d76b with SMTP id du7-20020a05621409a700b006238bf3d76bls3496216qvb.0.-pod-prod-02-us; Mon, 19 Jun 2023 23:05:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6JT2u+xkNsrrX4yqQJrmF8rMumD3/ch8rFdFQSRjaxwD82Rb9ASYGJzrQujwOEH84E4pD4 X-Received: by 2002:a05:6214:2aa9:b0:5f4:357c:3bf5 with SMTP id js9-20020a0562142aa900b005f4357c3bf5mr14586198qvb.13.1687241149468; Mon, 19 Jun 2023 23:05:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687241149; cv=none; d=google.com; s=arc-20160816; b=RuzAmSG5gVz4SEuqPbCWStY2zmICwq8aFulEVS1QLoSGg16x1NZlXYMdIWvdHzelHJ pRUmqi34GGwWRFnWwuo63GQGCvhw/29Xw/sFI4q8o6DZ60k3ToAEnKb3ZQUFSmWbExsG mGPilzsRzOx6sh/GjDdv4cKqXaQSbTISn1vPAOg8+v2HdDGyRhBFdG0OkMWuXjAjFTBk uOKmnhSNj8vMUz7fXjiwdhr6rxGuwthzqqwJm/9xmXd1KSHl92MmEYJAeExqYkHA4UWg Rqku7D6AEfvRfG8WqaKgTPnsUipcq0isaZ0mFMYuhkj076NHQIhUY+y6T1V1F1VmDrr6 Nx2w== 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=LT5Avlx2357D43GnHpalAPDihZ7DpwkbW+ilStcz/m0=; b=0Q6luMamBh74WyAJM5CN6B7Lxq0WVnV5JevuuTFhPv/AW2/bWf8U6Jsz+nnyzq3gcE u0q6wshan14G1BG+w2Q0+3yVxmycdVxSKFKtFB6kXYX3OB4imek8z6ZlMa8TV560VpzE QXubS0YaH9pMvfd/EfJdMoCEHzpcubV+3b9zwuAd+KRb9ojnV8c9tUDbzdjwUTOEgB3N tYhTCk4YAStKJ1BS7TWh4oGO+WxdMjgMFL1dbIV18FUdawhDfUh325xzQvtRW5CAn41w dis37Ix5W0JUkVkVtQ7osp2lqY7cOinOe4aA3KJsSXXZw6gkHDpYNPLvpUuQyccJSAE8 Z/Rg== 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 e4-20020a0cd644000000b0062382f2e4bfsi116053qvj.8.2023.06.19.23.05.48 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jun 2023 23:05:49 -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 35K65iY1027569 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 20 Jun 2023 08:05:47 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 06/12] CI: Move qemuarm-bookworm hacks to CI layer Date: Tue, 20 Jun 2023 08:05:38 +0200 Message-Id: <20230620060544.19745-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230620060544.19745-1-ubely@ilbers.de> References: <20230620060544.19745-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: vCwHf+eyCN0d 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/qemuarm-bookworm.conf | 6 ------ meta-test/recipes-ci/images/isar-image-ci.bb | 6 ++++++ testsuite/citest.py | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf index ce533ee7..08192365 100644 --- a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf +++ b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf @@ -2,9 +2,3 @@ MACHINE ?= "qemuarm" DISTRO ?= "debian-bookworm" - -IMAGE_FSTYPES:append = " wic" -WKS_FILE ?= "sdimage-efi-sd" - -IMAGER_INSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}" -IMAGE_INSTALL += "expand-on-first-boot" diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index f69e1864..65822599 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -37,3 +37,9 @@ IMAGER_INSTALL:append:qemuamd64:ubuntu-focal ?= " ${SYSTEMD_BOOTLOADER_INSTALL}" WKS_FILE:qemuamd64:ubuntu-jammy ?= "sdimage-efi-sd" IMAGER_INSTALL:remove:qemuamd64:ubuntu-jammy ?= "${GRUB_BOOTLOADER_INSTALL}" IMAGER_INSTALL:append:qemuamd64:ubuntu-jammy ?= " ${SYSTEMD_BOOTLOADER_INSTALL}" + +# qemuarm-bookworm +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}" diff --git a/testsuite/citest.py b/testsuite/citest.py index 7751d54a..779d86e2 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -240,7 +240,7 @@ class NoCrossTest(CIBaseTest): def test_nocross_bookworm(self): targets = [ 'mc:qemuamd64-bookworm:isar-image-ci', - 'mc:qemuarm-bookworm:isar-image-base', + 'mc:qemuarm-bookworm:isar-image-ci', 'mc:qemui386-bookworm:isar-image-base', 'mc:qemumipsel-bookworm:isar-image-ci', 'mc:hikey-bookworm:isar-image-base' @@ -459,7 +459,8 @@ class VmBootTestFull(CIBaseTest): def test_arm_bookworm(self): self.init() - self.vm_start('arm','bookworm') + self.vm_start('arm','bookworm', \ + image='isar-image-ci') def test_i386_bookworm(self): self.init() -- 2.20.1