From: Uladzimir Bely <ubely@ilbers.de>
To: isar-users@googlegroups.com
Subject: [PATCH v4 01/12] CI: Introduce meta-test layer
Date: Tue, 20 Jun 2023 08:05:33 +0200 [thread overview]
Message-ID: <20230620060544.19745-2-ubely@ilbers.de> (raw)
In-Reply-To: <20230620060544.19745-1-ubely@ilbers.de>
From: Anton Mikanovich <amikan@ilbers.de>
This layer will be used for internal testing only and handle all the
customizations needed for testsuite.
- Move `isar-image-ci recipe` to this layer.
- Copy local.conf.sample from `meta-isar` layer to be able to remove
test-specific settings from `meta-isar` later. Don't kee unused options
in the copy - leave only original file in `meta-isar` self-documented.
Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
RECIPE-API-CHANGELOG.md | 5 +
meta-test/conf/bblayers.conf.sample | 18 ++++
meta-test/conf/conf-notes.txt | 3 +
meta-test/conf/layer.conf | 20 ++++
meta-test/conf/local.conf.sample | 91 +++++++++++++++++++
.../recipes-ci/images/isar-image-ci.bb | 5 +
.../isar-ci-ssh-setup/files/postinst | 0
.../isar-ci-ssh-setup_0.1.bb | 0
testsuite/cibuilder.py | 1 +
9 files changed, 143 insertions(+)
create mode 100644 meta-test/conf/bblayers.conf.sample
create mode 100644 meta-test/conf/conf-notes.txt
create mode 100644 meta-test/conf/layer.conf
create mode 100644 meta-test/conf/local.conf.sample
rename {meta-isar => meta-test}/recipes-ci/images/isar-image-ci.bb (52%)
rename {meta-isar => meta-test}/recipes-ci/isar-ci-ssh-setup/files/postinst (100%)
rename {meta-isar => meta-test}/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb (100%)
diff --git a/RECIPE-API-CHANGELOG.md b/RECIPE-API-CHANGELOG.md
index 7a16b5c2..bc892f53 100644
--- a/RECIPE-API-CHANGELOG.md
+++ b/RECIPE-API-CHANGELOG.md
@@ -492,3 +492,8 @@ Recipes inheriting dpkg-base now automatically have a bitbake target
exists for the current `DISTRO_ARCH`.
In that case the compat package can be built by adding `<foo>-compat`
to `DEPENDS` or `IMAGE_INSTALL`.
+
+### Introduce meta-test layer
+
+Some CI-related recipes and images moves to meta-test from meta-isar, so if
+a downstream used them, they should update their layers.conf accordingly.
diff --git a/meta-test/conf/bblayers.conf.sample b/meta-test/conf/bblayers.conf.sample
new file mode 100644
index 00000000..dcec6cf6
--- /dev/null
+++ b/meta-test/conf/bblayers.conf.sample
@@ -0,0 +1,18 @@
+# This software is a part of ISAR.
+# Copyright (C) 2023 ilbers GmbH
+
+# LAYER_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+LCONF_VERSION = "6"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+ ##ISARROOT##/meta \
+ ##ISARROOT##/meta-isar \
+ ##ISARROOT##/meta-test \
+ "
+BBLAYERS_NON_REMOVABLE ?= " \
+ ##ISARROOT##/meta \
+ "
diff --git a/meta-test/conf/conf-notes.txt b/meta-test/conf/conf-notes.txt
new file mode 100644
index 00000000..7da291af
--- /dev/null
+++ b/meta-test/conf/conf-notes.txt
@@ -0,0 +1,3 @@
+Common CI targets are:
+ mc:qemuamd64-bookworm:isar-image-ci
+ mc:qemuarm-bullseye:isar-image-ci
diff --git a/meta-test/conf/layer.conf b/meta-test/conf/layer.conf
new file mode 100644
index 00000000..07b5c77d
--- /dev/null
+++ b/meta-test/conf/layer.conf
@@ -0,0 +1,20 @@
+# This software is a part of ISAR.
+# Copyright (C) 2023 ilbers GmbH
+
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb"
+
+BBFILE_COLLECTIONS += "test"
+BBFILE_PATTERN_test = "^${LAYERDIR}/"
+BBFILE_PRIORITY_test = "10"
+
+# This should only be incremented on significant changes that will
+# cause compatibility issues with other layers
+LAYERVERSION_test = "1"
+LAYERSERIES_COMPAT_test = "v0.6"
+
+LAYERDIR_test = "${LAYERDIR}"
+LAYERDIR_test[vardepvalue] = "meta-test"
diff --git a/meta-test/conf/local.conf.sample b/meta-test/conf/local.conf.sample
new file mode 100644
index 00000000..ed569c5c
--- /dev/null
+++ b/meta-test/conf/local.conf.sample
@@ -0,0 +1,91 @@
+# This software is a part of ISAR.
+# Copyright (C) 2023 ilbers GmbH
+
+# Machine and distro selection
+MACHINE ??= "qemuarm"
+DISTRO ??= "debian-bullseye"
+DISTRO_ARCH ??= "armhf"
+
+# The list of known multiple configurations
+BBMULTICONFIG = " \
+ qemuarm-buster \
+ qemuarm-bullseye \
+ qemuarm-bookworm \
+ qemuarm64-buster \
+ qemuarm64-bullseye \
+ qemuarm64-bookworm \
+ qemui386-buster \
+ qemui386-bullseye \
+ qemui386-bookworm \
+ qemuamd64-buster \
+ qemuamd64-bullseye \
+ qemuamd64-sb-bullseye \
+ qemuamd64-bookworm \
+ container-amd64-buster \
+ container-amd64-bullseye \
+ container-amd64-bookworm \
+ qemumipsel-buster \
+ qemumipsel-bullseye \
+ qemumipsel-bookworm \
+ qemuriscv64-sid-ports \
+ bananapi-buster \
+ bananapi-bullseye \
+ de0-nano-soc-buster \
+ de0-nano-soc-bullseye \
+ hikey-bullseye \
+ hikey-bookworm \
+ imx6-sabrelite-buster \
+ imx6-sabrelite-bullseye \
+ phyboard-mira-bullseye \
+ nanopi-neo-buster \
+ nanopi-neo-bullseye \
+ stm32mp15x-buster \
+ stm32mp15x-bullseye \
+ virtualbox-bullseye \
+ rpi-arm-bullseye \
+ rpi-arm-v7-bullseye \
+ rpi-arm-v7l-bullseye \
+ rpi-arm64-v8-bullseye \
+ sifive-fu540-sid-ports \
+ starfive-visionfive2-sid-ports \
+ qemuarm64-focal \
+ qemuarm64-jammy \
+ qemuamd64-focal \
+ qemuamd64-jammy \
+"
+
+# Disable interactive patch resolution
+PATCHRESOLVE = "noop"
+
+# Disk Space Monitoring settings
+BB_DISKMON_DIRS = "\
+ STOPTASKS,${TMPDIR},1G,100K \
+ STOPTASKS,${DL_DIR},1G,100K \
+ STOPTASKS,${SSTATE_DIR},1G,100K \
+ STOPTASKS,/tmp,100M,100K \
+ HALT,${TMPDIR},100M,1K \
+ HALT,${DL_DIR},100M,1K \
+ HALT,${SSTATE_DIR},100M,1K \
+ HALT,/tmp,10M,1K"
+
+# Isar and external MIRRORS in case of service unavailable
+MIRRORS ?= "git?://salsa\.debian\.org/debian/.* git://github.com/ilbers/BASENAME"
+MIRRORS += "https?://cdn\.kernel\.org/.* https://mirrors.edge.kernel.org/PATH"
+
+# The default list of extra packages
+IMAGE_INSTALL = "hello-isar example-raw example-module-${KERNEL_NAME} enable-fsck isar-exclude-docs samefile hello isar-disable-apt-cache cowsay example-prebuilt"
+
+# Users and groups
+USERS += "root"
+USER_root[password] ??= "$6$rounds=10000$RXeWrnFmkY$DtuS/OmsAS2cCEDo0BF5qQsizIrq6jPgXnwv3PHqREJeKd1sXdHX/ayQtuQWVDHe0KIO0/sVH8dvQm1KthF0d/"
+
+GROUPS += "isar"
+GROUP_isar[flags] = "system"
+
+USERS += "isar"
+USER_isar[gid] = "isar"
+USER_isar[home] = "/var/lib/isar"
+USER_isar[comment] = "My isar user"
+USER_isar[flags] = "system create-home"
+USER_isar[password] = "isar"
+USER_isar[flags] += "clear-text-password"
diff --git a/meta-isar/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-ci/images/isar-image-ci.bb
similarity index 52%
rename from meta-isar/recipes-ci/images/isar-image-ci.bb
rename to meta-test/recipes-ci/images/isar-image-ci.bb
index 77b1ef6e..93c7065b 100644
--- a/meta-isar/recipes-ci/images/isar-image-ci.bb
+++ b/meta-test/recipes-ci/images/isar-image-ci.bb
@@ -5,5 +5,10 @@
require recipes-core/images/isar-image-base.bb
+FILESEXTRAPATHS:append = ":${LAYERDIR_isar}/recipes-core/images:"
+
+# Avoid ISAR_RELEASE_CMD warning in image.bbclass
+ISAR_RELEASE_CMD = "git -C ${LAYERDIR_test} describe --tags --dirty --match 'v[0-9].[0-9]*'"
+
# Setup SSH server on board
IMAGE_INSTALL += "isar-ci-ssh-setup"
diff --git a/meta-isar/recipes-ci/isar-ci-ssh-setup/files/postinst b/meta-test/recipes-ci/isar-ci-ssh-setup/files/postinst
similarity index 100%
rename from meta-isar/recipes-ci/isar-ci-ssh-setup/files/postinst
rename to meta-test/recipes-ci/isar-ci-ssh-setup/files/postinst
diff --git a/meta-isar/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb b/meta-test/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb
similarity index 100%
rename from meta-isar/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb
rename to meta-test/recipes-ci/isar-ci-ssh-setup/isar-ci-ssh-setup_0.1.bb
diff --git a/testsuite/cibuilder.py b/testsuite/cibuilder.py
index a0c5711f..a03ff050 100755
--- a/testsuite/cibuilder.py
+++ b/testsuite/cibuilder.py
@@ -44,6 +44,7 @@ class CIBuilder(Test):
self.error("Broken test implementation: init() called multiple times.")
self.build_dir = os.path.join(isar_root, build_dir)
os.chdir(isar_root)
+ os.environ["TEMPLATECONF"] = "meta-test/conf"
path.usable_rw_dir(self.build_dir)
output = process.getoutput('/bin/bash -c "source isar-init-build-env \
%s 2>&1 >/dev/null; env"' % self.build_dir)
--
2.20.1
next prev parent reply other threads:[~2023-06-20 6:05 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 6:05 [PATCH v4 00/12] Move testsuite hacks to separate layer Uladzimir Bely
2023-06-20 6:05 ` Uladzimir Bely [this message]
2023-06-20 6:05 ` [PATCH v4 02/12] ubuntu: Fix WKS_FILE overriding Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 03/12] CI: Move qemuamd64-bookworm hacks to CI layer Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 04/12] CI: Move qemuamd64-bullseye " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 05/12] CI: Move qemuamd64-buster " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 06/12] CI: Move qemuarm-bookworm " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 07/12] CI: Move qemuarm64-bookworm " Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 08/12] meta-isar: Cleanup machine configs Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 09/12] meta-isar: Remove qemuamd64-sb settings from multiconfig Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 10/12] meta-isar: Base qemuamd64-sb config on qemuamd64 Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 11/12] meta-isar: Remove imx6-sabrelite settings from multiconfig Uladzimir Bely
2023-06-20 6:05 ` [PATCH v4 12/12] meta-isar: Unify multiconfigs to use weak assignments Uladzimir Bely
2023-06-21 13:49 ` [PATCH v4 00/12] Move testsuite hacks to separate layer Henning Schild
2023-06-27 5:21 ` Uladzimir Bely
2023-06-27 5:32 ` Uladzimir Bely
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=20230620060544.19745-2-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