From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7239976793797558272 X-Received: by 2002:ad4:5f0f:0:b0:626:3a5a:f8f8 with SMTP id fo15-20020ad45f0f000000b006263a5af8f8mr14337246qvb.58.1685688458598; Thu, 01 Jun 2023 23:47:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6214:b2e:b0:626:3bf3:c6bf with SMTP id w14-20020a0562140b2e00b006263bf3c6bfls119941qvj.0.-pod-prod-05-us; Thu, 01 Jun 2023 23:47:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6zt/ALgP5vLGjvwZmP0+X1nIyHhR88MhbRjx0E+/DdclQ4yLoka4cmBKOEiKWNuTGGMB30 X-Received: by 2002:a67:b342:0:b0:43b:23b4:2dab with SMTP id b2-20020a67b342000000b0043b23b42dabmr939489vsm.12.1685688457867; Thu, 01 Jun 2023 23:47:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685688457; cv=none; d=google.com; s=arc-20160816; b=lzqW0oDi2neHUaWmY7i4O/1ARkFE1K49SCBR3QNQArOHDhmP/vlzZ/kx0GVZwtBRH0 Sl7pxIbj1sGelnOIZHoEvxIeLnsUs9RdYFGnsju0pTGg6Y9K1+QhNQHcNnX4Aj6IsFrS moHjPGhKSPkNZBGi42jxONMLETxc5qUOxM+I7vBFjQkcd4VtGaUhsOpiYJ6X3E073FBa ffagqMluPt68bP0+UfO9BOfRS63xchOGPIEsF7tWtpDsBA9MY2sqKQLzLZ4V+PBueyOT tGcdfwmh9gEWcT63bLXgOkQ1KJGpN4bsGKVTPrPEUR+WmoSK/yCF/ACBsRixRsvn7I9E PUMg== 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=FMNLo+iNC+Tc2JDr3npE9RoHYhoeCAG7GR8QESAcAQw=; b=KYsed7wHhdejEY7fHw9rFs8yHwLg584gzHbhLBnpftvZgSLcRQ3cHDgeyV7kJvfoyK QWLaDmk2/NXpoJPDgeCKIqLw7X8LdPUo2MK8ryu5GwMNkSwxQgh7PmETmvxJ5hraXUQe jXXbEB+R+NWs3NJde/gKWlpUgA2RVij6cLmc9SCHg+veYejWeATNHlPjKInNrbSL5+1g 3vmcLo/2fFEHi5UrCT0bZLe1j0nHTr8wEMmD9yADIVbwC2b91utred7YuoCjkgrXlEpQ SEe19j20+HrRdRShq1KUPiQStQN7RVYGE2yCjzwbwWkdcWCEs4cYgjkbQMKuuiAEdp7z 2zfA== 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 e32-20020a0561020fa000b00437e87b8e73si54282vsv.2.2023.06.01.23.47.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 01 Jun 2023 23:47:37 -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 3526lTcu003460 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 2 Jun 2023 08:47:31 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v2 05/10] CI: Move qemuamd64-buster hacks to CI layer Date: Fri, 2 Jun 2023 08:47:24 +0200 Message-Id: <20230602064729.10331-6-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: P5pDkc+UKdgM 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 64ca7dfa..39ba4528 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -21,6 +21,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