From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a05:6a00:21c9:b0:654:4989:f2b with SMTP id t9-20020a056a0021c900b0065449890f2bmr9178181pfj.1.1686553984218; Mon, 12 Jun 2023 00:13:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a62:860d:0:b0:64d:6c82:157e with SMTP id x13-20020a62860d000000b0064d6c82157els128421pfd.0.-pod-prod-00-us; Mon, 12 Jun 2023 00:13:03 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7FrV2a40Qj5pcivKjQJZNppatXoDJC9wm0CF2Ng7GpcRmGVVGbvB1w9x+djblmKR4dXhAf X-Received: by 2002:a05:6a00:1da0:b0:646:f971:b179 with SMTP id z32-20020a056a001da000b00646f971b179mr13312923pfw.16.1686553983123; Mon, 12 Jun 2023 00:13:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686553983; cv=none; d=google.com; s=arc-20160816; b=H63RRHYokf2M1k/ZcoIRM3JrUqW+KBXjsGu5HeR3mItvjjexau+7nOlwgke+vVi4Wb JW9FiqniZoVdQ4/7+rqmsOpqBTLeNrtsVH4b07Vo78fiQXWSYJI5szxPgw/XwPLId6cs LJuOR+YJewUV4Zv0ZZAZ9LUrFIow2P6Zi8V1Zu7vkqTqL2Eg+2ilz7+gZTivF8GW9QjD Rio6ZN5bzNkPQPFmr2tqtrLWkUa2Ea+JJnNTbDB5qUSyG1aawmFEEY3LXzxI/N7pOeET LkQAlDgHNSJhKvTHQxf6pL0LnnLh8YrFQa41tUUJWYd7hDhErlOcLoK4ak++youEYcjn Q4Mw== 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=+AnoVE9Z1gGntZY8ZEb3Th7CSPl8K9Mkht8vZHV6XYQ=; b=WJZoB6rUeArdvXdTvQucnN7TyxBf9yZ12Nx6f+DMJGvmbM2Ef/iMyYWi7Xz2C1RIaa dsBZOiGUZahx5g0kA2yIRQXSUNib9qeJOvfjKlo+YUeArTkKvpXZ7giSrPBYhNhmeP7R 4r3cSpSy0fyClsCf/CdjL4/vqUxpxb/j7BtPm+EItcr1clNS5g0WTPKhrcj1tjsxPAyS FBtWSuxNkxNpi+W/fSVqQZDP83H9Yi9qHk0ejJrK8Tejh95vaSoUfdJS5AYyebuXoBFI RUEtkirPsg+5/LWhju3csN3av6F/9JI0vc06EKL9jmZTY62ugASwOOuQ3MPv4GYdKlmo gYEQ== 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 bu4-20020a056a00410400b006438069d21bsi1056963pfb.1.2023.06.12.00.13.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jun 2023 00:13:02 -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 35C7Cucj007465 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 12 Jun 2023 09:12:58 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 03/10] CI: Move qemuamd64-bookworm hacks to CI layer Date: Mon, 12 Jun 2023 09:12:49 +0200 Message-Id: <20230612071256.8688-4-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: vqRp3pljG+o2 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/qemuamd64-bookworm.conf | 1 - meta-test/recipes-ci/images/isar-image-ci.bb | 3 +++ testsuite/citest.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/meta-isar/conf/multiconfig/qemuamd64-bookworm.conf b/meta-isar/conf/multiconfig/qemuamd64-bookworm.conf index 591918de..a5ad814f 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-bookworm.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-bookworm.conf @@ -2,4 +2,3 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-bookworm" -WKS_FILE ?= "multipart-efi.wks" diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index 567c6cda..4ef1333b 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -13,6 +13,9 @@ ISAR_RELEASE_CMD = "git -C ${LAYERDIR_test} describe --tags --dirty --match 'v[0 # Setup SSH server on board IMAGE_INSTALL += "isar-ci-ssh-setup" +# qemuamd64-bookworm +WKS_FILE:qemuamd64:debian-bookworm ?= "multipart-efi.wks" + # qemuamd64-focal WKS_FILE:qemuamd64:ubuntu-focal ?= "sdimage-efi-sd" IMAGER_INSTALL:remove:qemuamd64:ubuntu-focal ?= "${GRUB_BOOTLOADER_INSTALL}" diff --git a/testsuite/citest.py b/testsuite/citest.py index 17a90244..e4b36519 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -238,7 +238,7 @@ class NoCrossTest(CIBaseTest): def test_nocross_bookworm(self): targets = [ - 'mc:qemuamd64-bookworm:isar-image-base', + 'mc:qemuamd64-bookworm:isar-image-ci', 'mc:qemuarm-bookworm:isar-image-base', 'mc:qemui386-bookworm:isar-image-base', 'mc:qemumipsel-bookworm:isar-image-ci', @@ -452,7 +452,7 @@ class VmBootTestFull(CIBaseTest): def test_amd64_bookworm(self): self.init() - self.vm_start('amd64','bookworm') + self.vm_start('amd64', 'bookworm', image='isar-image-ci') def test_arm_bookworm(self): self.init() -- 2.20.1