From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7239976793797558272 X-Received: by 2002:a05:6214:c4c:b0:625:7c0b:4640 with SMTP id r12-20020a0562140c4c00b006257c0b4640mr12986083qvj.22.1685688458605; Thu, 01 Jun 2023 23:47:38 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:58b2:0:b0:623:8497:1410 with SMTP id ea18-20020ad458b2000000b0062384971410ls338996qvb.1.-pod-prod-02-us; Thu, 01 Jun 2023 23:47:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6+A+X9KxLPlMr+RIg+mPEgsUTCgAyy+Syaf97WuuuzTjJ9w0YIeH4Tdmef8l5UZv7dwfKm X-Received: by 2002:a1f:48c1:0:b0:461:37d:dd3e with SMTP id v184-20020a1f48c1000000b00461037ddd3emr106168vka.15.1685688457866; 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=lp5U943wXVTZHWpu2RtYvL9Yy0Mi2ZysH/jXeTHzDmlNnN5cRq5Vlpas9IGdnvL1ua nbO7h3fBsuzBolwDvni4oKWxlOMt+6P2jJMGYBM4CkOgmfwSSV5H1y316TUAAAx+jdz9 guE1OsSjI4gJqr9xR9tW1rpjyEZZfTrKwTjxOHolRHxTmnXP/fCWmiTP5238n7nErahn 1Ps+FZgdaZwZDBbUMY4CX77UM89E0ygdWte4hILEwj/aLsPnuFoAyxMUYhSeu13rHkdE WuYsvZmScNdczWDqJBJa80+qKDfmPCarf57yPwXTDtj0knnu2tZ7KkyK72dg/2/plHOP Mbxw== 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=HCnAJednoPNohnLXXffV5rgVyef6QCwSsWe6C9dU6rM=; b=NnWH7DohI/EjM0yErK6z+74pGOCjAD1e8BqfID1FLwMFw9e3mz7McBHGeabEm/j1PQ OwkGPh7npEsLSNAupGbHf31ITM5ZIMobMQIzRG6RDadQB3NwuW8fT87luSy8OR+9T6fM FZAqSsfzlMDIxKev8QIhWKn8B5vTWEqCJkU8wK8H5v+n/P/nbhvOlymhqPB9zs4BDZ7n dNdObZqH4EWBtsPIRGc47ua1adD3ag13cj6jQrdH4A/rQ6vocSRJYubQzQktTanZnmvy j3Kx3+Cl2NVmo1/Q3/DN6kHtEl6SsT0zaMzOXC1p3KomJa4i2R6sd5rODJnfIVXZ1B+C MWlg== 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 13-20020ac5ce8d000000b0045391f84a1esi101018vke.5.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 3526lTcv003460 (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 06/10] CI: Move qemuarm-bookworm hacks to CI layer Date: Fri, 2 Jun 2023 08:47:25 +0200 Message-Id: <20230602064729.10331-7-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: xMBp5zqVB2vY 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/qemuarm-bookworm.conf | 6 ------ meta-test/recipes-ci/images/isar-image-ci.bb | 6 ++++++ testsuite/citest.py | 5 +++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf index ce533ee7..08192365 100644 --- a/meta-isar/conf/multiconfig/qemuarm-bookworm.conf +++ b/meta-isar/conf/multiconfig/qemuarm-bookworm.conf @@ -2,9 +2,3 @@ MACHINE ?= "qemuarm" DISTRO ?= "debian-bookworm" - -IMAGE_FSTYPES:append = " wic" -WKS_FILE ?= "sdimage-efi-sd" - -IMAGER_INSTALL += "${SYSTEMD_BOOTLOADER_INSTALL}" -IMAGE_INSTALL += "expand-on-first-boot" diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb index 39ba4528..6fd397d3 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -35,3 +35,9 @@ IMAGER_INSTALL:append:qemuamd64:ubuntu-focal ?= " ${SYSTEMD_BOOTLOADER_INSTALL}" WKS_FILE:qemuamd64:ubuntu-jammy ?= "sdimage-efi-sd" IMAGER_INSTALL:remove:qemuamd64:ubuntu-jammy ?= "${GRUB_BOOTLOADER_INSTALL}" IMAGER_INSTALL:append:qemuamd64:ubuntu-jammy ?= " ${SYSTEMD_BOOTLOADER_INSTALL}" + +# qemuarm-bookworm +IMAGE_FSTYPES:append:qemuarm:debian-bookworm ?= " wic" +WKS_FILE:qemuarm:debian-bookworm ?= "sdimage-efi-sd" +IMAGE_INSTALL:append:qemuarm:debian-bookworm ?= " expand-on-first-boot" +IMAGER_INSTALL:append:qemuarm:debian-bookworm ?= " ${SYSTEMD_BOOTLOADER_INSTALL}" diff --git a/testsuite/citest.py b/testsuite/citest.py index 7751d54a..779d86e2 100755 --- a/testsuite/citest.py +++ b/testsuite/citest.py @@ -240,7 +240,7 @@ class NoCrossTest(CIBaseTest): def test_nocross_bookworm(self): targets = [ 'mc:qemuamd64-bookworm:isar-image-ci', - 'mc:qemuarm-bookworm:isar-image-base', + 'mc:qemuarm-bookworm:isar-image-ci', 'mc:qemui386-bookworm:isar-image-base', 'mc:qemumipsel-bookworm:isar-image-ci', 'mc:hikey-bookworm:isar-image-base' @@ -459,7 +459,8 @@ class VmBootTestFull(CIBaseTest): def test_arm_bookworm(self): self.init() - self.vm_start('arm','bookworm') + self.vm_start('arm','bookworm', \ + image='isar-image-ci') def test_i386_bookworm(self): self.init() -- 2.20.1