From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7227180191860129792 X-Received: by 2002:a05:6870:c181:b0:184:6c49:4245 with SMTP id h1-20020a056870c18100b001846c494245mr2427579oad.7.1682709017925; Fri, 28 Apr 2023 12:10:17 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6830:3987:b0:6a5:e8ad:7437 with SMTP id bs7-20020a056830398700b006a5e8ad7437ls910399otb.9.-pod-prod-gmail; Fri, 28 Apr 2023 12:10:17 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ69H6L2zYyAqnvGyx2WmvZjNTRqTS7dW/JLOeIWij58ngSGRQamwAvcO5NGOWndvNvkJ05m X-Received: by 2002:a9d:620b:0:b0:6a6:1e6d:b1f8 with SMTP id g11-20020a9d620b000000b006a61e6db1f8mr3153652otj.13.1682709017412; Fri, 28 Apr 2023 12:10:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682709017; cv=none; d=google.com; s=arc-20160816; b=JCBEHMEcTiAacVO00KlA2TgPPHA9lTGqBea25+zlcM+EZA9XAXJB8WoqZpy652p+X9 ndniMA0sLKc26aZG1R1NpkgRqBCi/GqRYCAkcXolE0YjyuATaE/jCX9ZWcPsqExKb+sA 4r7JcxRdM6YNqAbwXsPOI4FNtmg+evbQwo/JlSHe2pwyrQB5JJ2YaJflgJNO8Lamfxc3 XzYHkB6SP3jHqFmbnhTfhd+Zi0hb/dV2Ht/SFTfr3JNEs+qFaFR4Nsl16WkXxWn9t8ms OiHwjSynhUVjKr1jc476Ly4oK+G+u9n5443U4t5WdmGb2lR0WhvGUcdi5llUwHzOfKTl eYxg== 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:cc:to:from; bh=DbwSry7T6cRknDHU7SWG+Ljz6x9ugV5ZnxOimKSHxuw=; b=VyEJ2tX6VUp4anS/QWkwnI5uqByc+jt5yxzNAmUJDwVy/Fmea6D9v85li9Ou4gdQQv RhrCan9ixun9YbXWXVvDgu/dwSkAa1M0m5RwO8ffd7b9Hp/BXG87HAGDAcw+p/asoCXy RT4TcbRxVwKhfDR9/1O8v2xvQJufxRx8Bh/WOjh20GwIEZEbaI4+fOv/M1HnlkJ7tSeZ iklFyHuixwHsTfJ4F+8CB/mG16aq3C27XVvH2cUcS8ql2YsQTbsicyknyyA6jm8L26ly Ie/NMfdo56vZZcuZlag+xdlrrXmk/zQuTMbMtCWoDlSmElpxyNOufykmSefBWjAiyeiw Eb1g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id cr26-20020a056830671a00b006a5ec143a43si1706109otb.1.2023.04.28.12.10.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Apr 2023 12:10:17 -0700 (PDT) Received-SPF: pass (google.com: domain of amikan@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 amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.com (IN-213-226-141-183.bitemobile.lv [213.226.141.183] (may be forged)) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 33SJA7FA011347 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 21:10:11 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 03/10] CI: Move qemuamd64-bookworm hacks to CI layer Date: Fri, 28 Apr 2023 22:09:57 +0300 Message-Id: <20230428191004.243993-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230428191004.243993-1-amikan@ilbers.de> References: <20230428191004.243993-1-amikan@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: DNfy/LgKUTWS 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 e17ae27e..bca17049 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.34.1