From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a05:6e02:154f:b0:343:940e:e98 with SMTP id j15-20020a056e02154f00b00343940e0e98mr2812744ilu.3.1687241148574; Mon, 19 Jun 2023 23:05:48 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6e02:130e:b0:340:5d8:9a53 with SMTP id g14-20020a056e02130e00b0034005d89a53ls857789ilr.1.-pod-prod-09-us; Mon, 19 Jun 2023 23:05:48 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ56IT4OdbItqftwhChSZFweDKMau6kUkJKCC1U8wcqsOhe3haMfoRkH/tjSXVA2X8SUwlfo X-Received: by 2002:a92:db52:0:b0:340:57e1:615d with SMTP id w18-20020a92db52000000b0034057e1615dmr2840778ilq.29.1687241148015; Mon, 19 Jun 2023 23:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687241148; cv=none; d=google.com; s=arc-20160816; b=ekHxUjsHKybZm3uPc3b/2wYScaZz6cRGY7y6cy38Q+D+utEP3WiWiH8BiIoKPWx+Lw cO9vxkyPJ+Rq2xQ5I0STjpDyjR3E1NNUX3zbxBd85XKDARpHlELx6gK90zb7AgIBfBlD i2sLRuROX7uZqi+kTPoNL/rwaKpeeuy1cVn2V6fDnSp4gRyRO5zKdTnnps0Ktyf6FOO6 i3INMXNDnfDUGYWy/4NbJEwhHMLonuWvT1iL2f/RKwQqe48qg6bRM8f9IgghC+WQ6Ddf 0GTNUbXa1WXJrLfk+httRUahv7c0WrmQ1hvXW8dKJ4ZqtY8uXhAF+uI2OiXaq95SIiwx g3ag== 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=Ni8kT6OTYr+G/DlU2I9wQcCiHR0dvjJ00FCQYTyqoDEqhDieJbqTlrVT8dgvZ3nFEQ yb9mZqrPkhmdfcwnNh3R1OmLdLHzWRWvIkZPRxmHoUnOXYt8QZ8d/bKMUhh5TPk44se2 T0XT566g/z3YHzilqDCVooHf9jA+2m15ENaGMhr5az/PxIJwBAf2bke9em+BOl9Lxr6W 2OI6nPRgQtBZ1V5OlAWq/ackiSOO53f6qLfRyNbCYOoGQCvYA44InvS4pbXagyLIs3rL 4UkQXApMKUHryjW2qOxydLYkRL6s7e9csOQVCrC65123gU4zaowS6IMcBcAYPMSzpe/v eN3w== 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 n14-20020a056e02148e00b0032e1027cbf4si117834ilk.1.2023.06.19.23.05.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Jun 2023 23:05:47 -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 35K65iXw027569 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 20 Jun 2023 08:05:46 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v4 03/12] CI: Move qemuamd64-bookworm hacks to CI layer Date: Tue, 20 Jun 2023 08:05:35 +0200 Message-Id: <20230620060544.19745-4-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: qBrdJEFGTXkJ 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