From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:a05:6214:c62:b0:631:6eea:c501 with SMTP id t2-20020a0562140c6200b006316eeac501mr3816077qvj.13.1687241150251; Mon, 19 Jun 2023 23:05:50 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:a4b:b0:62d:e039:8b3c with SMTP id ee11-20020a0562140a4b00b0062de0398b3cls1320444qvb.1.-pod-prod-06-us; Mon, 19 Jun 2023 23:05:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5uzoVeyaYSu+tblUjEVXQFeqFB9T7VUfcBciEcLgOT3teTt9g4zbeoMl4MXVhFgeLcog1W X-Received: by 2002:a05:6214:ccb:b0:621:231d:8a37 with SMTP id 11-20020a0562140ccb00b00621231d8a37mr13871615qvx.15.1687241149467; 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=s6QF2761sj4xMB6GE3vNGXcFMsE4GfadPwYj0Z6N68eekP8CtIJfRsT6J+GJYkffgV Aq0yXk/alB0mfouY4UbmqZ4OwC9GAKOVooTov0SOEuz5GKGyfpI74d30pM2jWNyp9K0o o/s+2DdNgrVrbBdX5Wex8DApjHh8UaTN0hebdOL5AjqeC4dZg5BSVMOSAoWW+BL0MHQJ XT9nNo07R7yDTZRql3rjiTRVUGnXoK6+96gKhZhNGhMcY7hi/w1DzSbZNxqkYDWSCnnP P3NcrQi9rct0rCct9/vP0ANmfrgDRw3H24DYgPA/+B4Zm4BPHmS6oVADWBy7MmY1kIAr 2pew== 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=733/o3quzlZ+Hcim8+ngf6yJOk8CmT1VbvWm6UpkFFc=; b=i2ZCcb4s0kfnOg9QIpSgECME8MJe/cUvnx27rz812nOYjLErrBGZaCVi/vxwJjF2ar 0qsR6HOx0fqlCoUYxSMN4k/f2MQaOb00uz7GYMCJwZKrscSrOKx/LB1SrwJoO7uZXLJ4 1AKOQkkSOyCDGipDVZc1BK9anUsdy2ifX92xotgTP1YrvqJJ0vrAlAbAP0iO/aTuGHgt 284I1R0fnXYBKDJDW6oXK4ZlC/tUE/pt8jDGpguCO7k8FxpFIU/Y/uwexOW/heZ6j2rc kz06BT4T7sA6cvdhlHhEhGfEgIVHt+z2lSLFUU3GqvjPmzbCjlEF8/r9JLuPzcfSI5c1 mMBw== 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 cs1-20020ad44c41000000b006260dab0171si131195qvb.3.2023.06.19.23.05.49 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 35K65iY0027569 (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 05/12] CI: Move qemuamd64-buster hacks to CI layer Date: Tue, 20 Jun 2023 08:05:37 +0200 Message-Id: <20230620060544.19745-6-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: V+vH09JhsCFy 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-buster.conf | 4 ---- meta-test/recipes-ci/images/isar-image-ci.bb | 5 +++++ testsuite/citest.py | 8 +++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/meta-isar/conf/multiconfig/qemuamd64-buster.conf b/meta-isar/conf/multiconfig/qemuamd64-buster.conf index 79d0aa63..3fabd675 100644 --- a/meta-isar/conf/multiconfig/qemuamd64-buster.conf +++ b/meta-isar/conf/multiconfig/qemuamd64-buster.conf @@ -2,7 +2,3 @@ MACHINE ?= "qemuamd64" DISTRO ?= "debian-buster" -WKS_FILE ?= "efi-plus-pcbios.wks" -IMAGER_INSTALL += "${SYSLINUX_BOOTLOADER_INSTALL}" - -IMAGE_FSTYPES ?= "wic ext4" diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index ad7560af..f69e1864 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -23,6 +23,11 @@ IMAGER_INSTALL:remove:qemuamd64:debian-bullseye ?= "${GRUB_BOOTLOADER_INSTALL}" IMAGER_INSTALL:append:qemuamd64:debian-bullseye ?= " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs" IMAGE_PREINSTALL:append:qemuamd64:debian-bullseye ?= " btrfs-progs" +# qemuamd64-buster +IMAGE_FSTYPES:qemuamd64:debian-buster ?= "wic ext4" +WKS_FILE:qemuamd64:debian-buster ?= "efi-plus-pcbios" +IMAGER_INSTALL:append:qemuamd64:debian-buster ?= " ${SYSLINUX_BOOTLOADER_INSTALL}" + # 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 4e6bf333..7751d54a 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -204,7 +204,7 @@ class NoCrossTest(CIBaseTest): 'mc:qemuarm64-bullseye:isar-image-ci', 'mc:qemui386-buster:isar-image-base', 'mc:qemui386-bullseye:isar-image-base', - 'mc:qemuamd64-buster:isar-image-base', + 'mc:qemuamd64-buster:isar-image-ci', 'mc:qemuamd64-bullseye:isar-initramfs', 'mc:qemumipsel-buster:isar-image-base', 'mc:qemumipsel-bullseye:isar-image-base', @@ -432,9 +432,11 @@ class VmBootTestFull(CIBaseTest): def test_amd64_buster(self): self.init() # test efi boot - self.vm_start('amd64','buster') + self.vm_start('amd64','buster', \ + image='isar-image-ci') # test pcbios boot - self.vm_start('amd64', 'buster', True) + self.vm_start('amd64', 'buster', True, \ + image='isar-image-ci') def test_amd64_focal(self): self.init() -- 2.20.1