From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7243694205603676160 X-Received: by 2002:ad4:5aa7:0:b0:626:1862:7d59 with SMTP id u7-20020ad45aa7000000b0062618627d59mr8993669qvg.56.1686553985772; Mon, 12 Jun 2023 00:13:05 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ad4:4f13:0:b0:626:103c:e385 with SMTP id fb19-20020ad44f13000000b00626103ce385ls177570qvb.0.-pod-prod-06-us; Mon, 12 Jun 2023 00:13:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5emdYnFKu44VcQLjITEOSheGwDryx27WKFzGyIsmz84FwPhmhY8F6GxPX+gnfesH48Dvsj X-Received: by 2002:ad4:5ba9:0:b0:621:83d:3a47 with SMTP id 9-20020ad45ba9000000b00621083d3a47mr9640787qvq.39.1686553985089; Mon, 12 Jun 2023 00:13:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686553985; cv=none; d=google.com; s=arc-20160816; b=koD8ktW81FlW0r8Wq2fitE9RI3dOproS0gjmRpQo2bT+r0ZtRrM93IYxzUhrykHqAX F2gnY6hvflg+zZ4GsU4k0JHJBo0jb0vCnQ4ay70rpkbx0YpCsP94IXdmqxGQUqDFYlvg Ln1oiNsH1aIRU++gRNOuWtq9iWHD3YPlLLoLYZ5rkmLgUXOGRVB9J4jCTFtNdwkf+FAq hOVhSlddZ2exh9seQb6JjumFRYo+aFrUVBuvENxAUAWo64nbgrvyVBw3QkRo7wxsbX62 GcFYAdmPOKXeBndyX2JwIs6GSrSFNG6v/tSGgur8MpVstOklVpWJxg/kOp0zwOsRlsle ffNg== 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=gktU94O5o2Ny/7SxPnhF1SzLbmlhTN7L4sa387RxfYE=; b=Q1XTDblC826EwPYQbgHfBykcDIOhmwHVdGreQrNP96dGVw/M3CCmjdZgNk2pHWY0fe mh0CwclHh8awEBka9MEwCmseoOfPciqhj1ed5FWJcus9UYuyzFgvZSuqbdaGSZwoQ0gQ YRBAQEV89CmusvuAaw3m939ceOXJysV/SSBrlUjqvASFHjr1B78fbVeM6KzMLjysgFjL 1z2k6rTCG1UYFMxrxvtMIDPZetCwc9phs1R2girqOUpuuczhzctJLM1Upd6JlDtDcSmf tUksbrQkqaDA3nG7RfQZSNNUAY+h502vkMp14fVPbH9eo2IMzIZQASZ0NDq5gpeBUlq6 Ix2w== 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 r13-20020a0cf60d000000b006262d9cc70esi769307qvm.5.2023.06.12.00.13.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jun 2023 00:13:05 -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 35C7Cucm007465 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 12 Jun 2023 09:12:58 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH v3 06/10] CI: Move qemuarm-bookworm hacks to CI layer Date: Mon, 12 Jun 2023 09:12:52 +0200 Message-Id: <20230612071256.8688-7-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230612071256.8688-1-ubely@ilbers.de> References: <20230612071256.8688-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: DEjZcF2GPTOA 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 f69e1864..b101c2c2 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -37,3 +37,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