From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v3 04/10] CI: Move qemuamd64-bullseye hacks to CI layer
Date: Mon, 12 Jun 2023 09:12:50 +0200 [thread overview]
Message-ID: <20230612071256.8688-5-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/machine/qemuamd64.conf | 5 -----
meta-isar/conf/multiconfig/qemuamd64-bullseye.conf | 2 --
meta-test/recipes-ci/images/isar-image-ci.bb | 7 +++++++
testsuite/citest.py | 9 +++++----
4 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/meta-isar/conf/machine/qemuamd64.conf b/meta-isar/conf/machine/qemuamd64.conf
index c02b3860..cdee9bdd 100644
--- a/meta-isar/conf/machine/qemuamd64.conf
+++ b/meta-isar/conf/machine/qemuamd64.conf
@@ -9,11 +9,6 @@ IMAGE_FSTYPES ?= "wic"
WKS_FILE ?= "sdimage-efi"
IMAGER_INSTALL += "${GRUB_BOOTLOADER_INSTALL}"
-WKS_FILE:debian-bullseye ?= "sdimage-efi-btrfs"
-IMAGER_INSTALL:remove:debian-bullseye = "${GRUB_BOOTLOADER_INSTALL}"
-IMAGER_INSTALL:append:debian-bullseye = " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs"
-IMAGE_PREINSTALL:append:debian-bullseye = " btrfs-progs"
-
IMAGE_INSTALL += "sshd-regen-keys"
IMAGE_INSTALL += "expand-on-first-boot"
diff --git a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
index 1c1326cd..1badc889 100644
--- a/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
+++ b/meta-isar/conf/multiconfig/qemuamd64-bullseye.conf
@@ -2,5 +2,3 @@
MACHINE ?= "qemuamd64"
DISTRO ?= "debian-bullseye"
-
-IMAGE_FSTYPES:append = " cpio.gz tar.gz"
diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb
index 4ef1333b..ad7560af 100644
--- a/meta-test/recipes-ci/images/isar-image-ci.bb
+++ b/meta-test/recipes-ci/images/isar-image-ci.bb
@@ -16,6 +16,13 @@ IMAGE_INSTALL += "isar-ci-ssh-setup"
# qemuamd64-bookworm
WKS_FILE:qemuamd64:debian-bookworm ?= "multipart-efi.wks"
+# qemuamd64-bullseye
+IMAGE_FSTYPES:append:qemuamd64:debian-bullseye ?= " cpio.gz tar.gz"
+WKS_FILE:qemuamd64:debian-bullseye ?= "sdimage-efi-btrfs"
+IMAGER_INSTALL:remove:qemuamd64:debian-bullseye ?= "${GRUB_BOOTLOADER_INSTALL}"
+IMAGER_INSTALL:append:qemuamd64:debian-bullseye ?= " ${SYSTEMD_BOOTLOADER_INSTALL} btrfs-progs"
+IMAGE_PREINSTALL:append:qemuamd64:debian-bullseye ?= " btrfs-progs"
+
# qemuamd64-focal
WKS_FILE:qemuamd64:ubuntu-focal ?= "sdimage-efi-sd"
IMAGER_INSTALL:remove:qemuamd64:ubuntu-focal ?= "${GRUB_BOOTLOADER_INSTALL}"
diff --git a/testsuite/citest.py b/testsuite/citest.py
index e4b36519..4e6bf333 100755
--- a/testsuite/citest.py
+++ b/testsuite/citest.py
@@ -26,7 +26,7 @@ class DevTest(CIBaseTest):
"""
def test_dev(self):
targets = [
- 'mc:qemuamd64-bullseye:isar-image-base',
+ 'mc:qemuamd64-bullseye:isar-image-ci',
'mc:qemuarm-bullseye:isar-image-base',
'mc:qemuarm-bullseye:isar-image-base:do_populate_sdk',
'mc:qemuarm64-bullseye:isar-image-base'
@@ -37,7 +37,7 @@ class DevTest(CIBaseTest):
def test_dev_apps(self):
targets = [
- 'mc:qemuamd64-bullseye:isar-image-base',
+ 'mc:qemuamd64-bullseye:isar-image-ci',
'mc:qemuarm64-bullseye:isar-image-base'
]
@@ -55,13 +55,14 @@ class DevTest(CIBaseTest):
file.write('do_fetch:append() {\n\n}')
try:
- self.perform_build_test('mc:qemuamd64-bullseye:isar-image-base')
+ self.perform_build_test('mc:qemuamd64-bullseye:isar-image-ci')
finally:
self.restorefile(dpkgbase_file)
def test_dev_run_amd64_bullseye(self):
self.init()
- self.vm_start('amd64', 'bullseye')
+ self.vm_start('amd64', 'bullseye', \
+ image='isar-image-ci')
def test_dev_run_arm64_bullseye(self):
self.init()
--
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 ` Uladzimir Bely [this message]
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 ` [PATCH v3 07/10] CI: Move qemuarm64-bookworm " Uladzimir Bely
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-5-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