From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7227180191860129792 X-Received: by 2002:a05:620a:1001:b0:74e:4595:f39 with SMTP id z1-20020a05620a100100b0074e45950f39mr1126364qkj.11.1682709021856; Fri, 28 Apr 2023 12:10:21 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:622a:2296:b0:3ef:327d:ac61 with SMTP id ay22-20020a05622a229600b003ef327dac61ls5238003qtb.4.-pod-prod-gmail; Fri, 28 Apr 2023 12:10:21 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7PVqxk8L23W9fpor1eUrRW4YaX/jWr+Xwc9uUJ573JZJTB7CmsDtxCaDoNjEYBS7w6Uy45 X-Received: by 2002:ac8:7e92:0:b0:3ef:612c:5877 with SMTP id w18-20020ac87e92000000b003ef612c5877mr10112400qtj.58.1682709021281; Fri, 28 Apr 2023 12:10:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682709021; cv=none; d=google.com; s=arc-20160816; b=rAL7xNhdTDk2rFfQaJJ2I4yyiRdKjn208nqXHfDbbXo6V5Yuh4mUd76SeocpYwJp2j SSuerZeVPUT8RMQxtzo7xM89vn2ieijghIgBG0Sz+t7sSOQvxh007+VfYgsYQ/wt2q4E 4GQQ6BhQMnlaOoXIZlbePenWTi1JJc5oG7BCfC2zgFkLCSHIGMFhcwl+bWilQxZv5XOO lXJ6jNeyYhiZPyouBXW+1wnbyPIyw12MsjfOjKBRcP5kH5tdXCeKtZ/vHhfwWwSD/EZj 6sSWFFMw/lI48MKHi1JJE/D7Zb1OkFl8EOlFQ+GubQl58+Y9eYkjeQJRpHdAfz3tgb8G +/Rw== 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=l10Mc8WydFK66aUudui/S1syqpRHlI0K8D/tFrda3ok=; b=xYEWQdeImQG93okwxS4/nVVC+4Y7E8+wi/iu0PQ64Do/5pV+5zCGUWlzdDdnB/BPn3 37JDoczwo3TSAuazzS3O0PyvVy67fb0Lwd00LX9rX+gQeyp9FZbwW352SwwW2S8Bfuvu XawWxMB+j9NfQDA3oOGe5tgrVV2kQohLwspcigu2AdsZZsXWYjh3YkFUZutMVFC0L8Yg rXIkmYbZQ8qXLnrty/IECO2Ku9GbmTv211zTcQHNCBjz9aGaYmvFS0FZ9ziqp+yXcY5v TsHaaOkrK+IMsHmVVurAsvZeY1/O6SIqXZ0Rp84OII8Psoscmn8h4KPyYKgr5T49tUBX ua5A== 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 cq6-20020a05622a424600b003ed73a9d023si1414692qtb.1.2023.04.28.12.10.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 28 Apr 2023 12:10:21 -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 33SJA7FD011347 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 28 Apr 2023 21:10:15 +0200 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v1 06/10] CI: Move qemuarm-bookworm hacks to CI layer Date: Fri, 28 Apr 2023 22:10:00 +0300 Message-Id: <20230428191004.243993-7-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: TZ1kJI94vqMR 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 94444062..0e065efb 100644 --- a/meta-test/recipes-ci/images/isar-image-ci.bb +++ b/meta-test/recipes-ci/images/isar-image-ci.bb @@ -30,3 +30,9 @@ IMAGER_INSTALL:append:qemuamd64:debian-buster ?= " ${SYSLINUX_BOOTLOADER_INSTALL WKS_FILE:qemuamd64:ubuntu-focal ?= "sdimage-efi-sd" IMAGER_INSTALL:remove:qemuamd64:ubuntu-focal ?= "${GRUB_BOOTLOADER_INSTALL}" IMAGER_INSTALL:append:qemuamd64:ubuntu-focal ?= " ${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.34.1