From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7239976793797558272 X-Received: by 2002:a05:6870:954f:b0:1a0:2fd5:150e with SMTP id v15-20020a056870954f00b001a02fd5150emr1366230oal.48.1685688456857; Thu, 01 Jun 2023 23:47:36 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6870:70b:b0:19f:9f28:a580 with SMTP id ea11-20020a056870070b00b0019f9f28a580ls164704oab.1.-pod-prod-05-us; Thu, 01 Jun 2023 23:47:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5jH/cMpt8JfPtq9zHeZMcUfHs5siLSYj5IqSn3jvOxq1SuxsTBX4GhZpIjIs/3VJLZkas0 X-Received: by 2002:aca:2201:0:b0:394:39dc:a4b0 with SMTP id b1-20020aca2201000000b0039439dca4b0mr1514347oic.52.1685688456174; Thu, 01 Jun 2023 23:47:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685688456; cv=none; d=google.com; s=arc-20160816; b=DmCGFxX/4OLGi3quOSlrfxjU3HBKTyhDX1mIbzeZ2vAf/QLQj02Kx8SAAqQaWBHDav CiY5HAeFCAogkmUfkY0Mm4XNF+Q/85YL8bC/xXzhipJqYq8xSQckoEYY2xS+28rTsIiP PaHgHO8V6pEAuSSEUUPoj3qcCe/+h6rkrkeaqy4xw40t/46ijv//QWnCo0GNzUzTebTl lyuJ25v2uP9+pswB+Dj12R2Q9gnrWADJYp/IGxned1Rf3O+meKdOwlcRzRmUx/UlT6a2 TYcbd1s4Flax6I09uztJLHcoCD8Fk40k8U4ZIg46WnAzPjw6U1Cmm8keV2LmHe4S6Aa6 4FMQ== 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=w517B69VyrDsKH7DUK986EoF2UsteMtTSXf3A8Ly4+8=; b=NE4wTecBb3co24ZuylgKFU6vO+Gkr3SP5w7PDA7KCMUZOpE1OiMvw4T04ib4g44KG8 2NTL55F7B2GmPVR+by7XaKFSeWBAFy6wbOUq9tdk107LGSck5EarzaTzaobUyXYVXvzk 0ZAABJeoehOybImBmPnBwWhHtCyNtbaxieiJBxs4YiYwGse1/DsXGtLMq8YXKkocd29p VBvY3dHSpmSh1iZ2aBZ1nFKwigrW6UaQhwPUg3nULeEuCEqPedrZe4Ai4gxuCsqZZl9I ZtdYrA++YFsRKtgsMuAOlXOIi6D4DzUq0ZGnGrXZhn/jMGqP7klAphLagke7OlnobcNA V7YQ== 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 t9-20020a17090aba8900b0025692d54496si162837pjr.3.2023.06.01.23.47.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Jun 2023 23:47:36 -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 3526lTcs003460 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 2 Jun 2023 08:47:30 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 03/10] CI: Move qemuamd64-bookworm hacks to CI layer Date: Fri, 2 Jun 2023 08:47:22 +0200 Message-Id: <20230602064729.10331-4-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: KIEEgEBXNS81 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 a1ff929e..badc1555 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -11,6 +11,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