[PATCH v1 07/10] CI: Move qemuarm64-bookworm hacks to CI layer

[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 a04c9d1f..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 += "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 0e065efb..16f62998 100644
--- a/meta-test/recipes-ci/images/isar-image-ci.bb
+++ b/meta-test/recipes-ci/images/isar-image-ci.bb
@@ -36,3 +36,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.34.1