From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v3 07/10] CI: Move qemuarm64-bookworm hacks to CI layer
Date: Mon, 12 Jun 2023 09:12:53 +0200 [thread overview]
Message-ID: <20230612071256.8688-8-ubely@ilbers.de> (raw)
In-Reply-To: <20230612071256.8688-1-ubely@ilbers.de>
From: Anton Mikanovich <amikan@ilbers.de>
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 <amikan@ilbers.de>
---
meta-isar/conf/multiconfig/qemuarm64-bookworm.conf | 3 ---
meta-test/recipes-ci/images/isar-image-ci.bb | 4 ++++
testsuite/citest.py | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf b/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf
index 714e4d73..c6b92d2e 100644
--- a/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf
+++ b/meta-isar/conf/multiconfig/qemuarm64-bookworm.conf
@@ -4,6 +4,3 @@
MACHINE ?= "qemuarm64"
DISTRO ?= "debian-bookworm"
-
-IMAGE_FSTYPES:append = " wic.xz"
-IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb
index b101c2c2..92bb2ba9 100644
--- a/meta-test/recipes-ci/images/isar-image-ci.bb
+++ b/meta-test/recipes-ci/images/isar-image-ci.bb
@@ -43,3 +43,7 @@ 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}"
+
+# qemuarm64-bookworm
+IMAGE_FSTYPES:append:qemuarm64:debian-bookworm ?= " wic.xz"
+IMAGER_INSTALL:append:qemuarm64:debian-bookworm ?= " ${GRUB_BOOTLOADER_INSTALL}"
diff --git a/testsuite/citest.py b/testsuite/citest.py
index 779d86e2..d49c5c8e 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -158,7 +158,7 @@ class CrossTest(CIBaseTest):
def test_cross_bookworm(self):
targets = [
'mc:qemuarm-bookworm:isar-image-ci',
- 'mc:qemuarm64-bookworm:isar-image-base'
+ 'mc:qemuarm64-bookworm:isar-image-ci'
]
self.init()
@@ -175,7 +175,7 @@ class WicTest(CIBaseTest):
:avocado: tags=wic,full
"""
def test_wic_nodeploy_partitions(self):
- targets = ['mc:qemuarm64-bookworm:isar-image-base']
+ targets = ['mc:qemuarm64-bookworm:isar-image-ci']
self.init()
self.delete_from_build_dir('tmp')
@@ -183,7 +183,7 @@ class WicTest(CIBaseTest):
wic_deploy_parts=False, debsrc_cache=True, compat_arch=False)
def test_wic_deploy_partitions(self):
- targets = ['mc:qemuarm64-bookworm:isar-image-base']
+ targets = ['mc:qemuarm64-bookworm:isar-image-ci']
self.init()
# reuse artifacts
--
2.20.1
next prev parent reply other threads:[~2023-06-12 7:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-12 7:12 [PATCH v3 00/10] Move testsuite hacks to separate layer Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 01/10] CI: Introduce meta-test layer Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 02/10] ubuntu: Fix WKS_FILE overriding Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 03/10] CI: Move qemuamd64-bookworm hacks to CI layer Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 04/10] CI: Move qemuamd64-bullseye " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 05/10] CI: Move qemuamd64-buster " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 06/10] CI: Move qemuarm-bookworm " Uladzimir Bely
2023-06-12 7:12 ` Uladzimir Bely [this message]
2023-06-12 7:12 ` [PATCH v3 08/10] meta-isar: Remove qemuamd64-sb settings from multiconfig Uladzimir Bely
2023-06-15 5:07 ` Jan Kiszka
2023-06-15 8:19 ` Anton Mikanovich
2023-06-15 9:15 ` MOESSBAUER, Felix
2023-06-12 7:12 ` [PATCH v3 09/10] meta-isar: Remove imx6-sabrelite " Uladzimir Bely
2023-06-12 7:12 ` [PATCH v3 10/10] meta-isar: Unify multiconfigs to use weak assignments Uladzimir Bely
2023-06-13 6:27 ` [PATCH v3 00/10] Move testsuite hacks to separate layer Uladzimir Bely
2023-06-15 5:13 ` Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230612071256.8688-8-ubely@ilbers.de \
--to=ubely@ilbers.de \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox