diff mbox series

kas: Support meta-test layer

Message ID 20240405092202.12879-1-ubely@ilbers.de
State Accepted, archived
Headers show
Series kas: Support meta-test layer | expand

Commit Message

Uladzimir Bely April 5, 2024, 9:21 a.m. UTC 
Add meta-test layer packages and images to kas menu configuration.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 kas/image/Kconfig                                   |  9 +++++++++
 kas/image/isar-image-ci.yaml                        |  7 +++++++
 kas/isar.yaml                                       |  5 +++--
 kas/package/Kconfig                                 | 13 +++++++++++--
 kas/package/pkg_isar-ci-ssh-setup.yaml              |  9 +++++++++
 .../images/isar-image-ci.bb                         |  0
 scripts/generate_yaml.sh                            |  2 +-
 7 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 kas/image/isar-image-ci.yaml
 create mode 100644 kas/package/pkg_isar-ci-ssh-setup.yaml
 rename meta-test/{recipes-ci => recipes-core}/images/isar-image-ci.bb (100%)

Comments

Uladzimir Bely April 11, 2024, 4:52 a.m. UTC | #1 
On Fri, 2024-04-05 at 12:21 +0300, Uladzimir Bely wrote:
> Add meta-test layer packages and images to kas menu configuration.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  kas/image/Kconfig                                   |  9 +++++++++
>  kas/image/isar-image-ci.yaml                        |  7 +++++++
>  kas/isar.yaml                                       |  5 +++--
>  kas/package/Kconfig                                 | 13
> +++++++++++--
>  kas/package/pkg_isar-ci-ssh-setup.yaml              |  9 +++++++++
>  .../images/isar-image-ci.bb                         |  0
>  scripts/generate_yaml.sh                            |  2 +-
>  7 files changed, 40 insertions(+), 5 deletions(-)
>  create mode 100644 kas/image/isar-image-ci.yaml
>  create mode 100644 kas/package/pkg_isar-ci-ssh-setup.yaml
>  rename meta-test/{recipes-ci => recipes-core}/images/isar-image-
> ci.bb (100%)

Applied to next.
diff mbox series

Patch

diff --git a/kas/image/Kconfig b/kas/image/Kconfig
index bc789064..45611c4e 100644
--- a/kas/image/Kconfig
+++ b/kas/image/Kconfig
@@ -22,6 +22,14 @@  config IMAGE_DEBUG
 	help
 	  This image includes some tools preinstalled useful for debug.
 
+config IMAGE_CI
+	bool "CI image"
+	select PACKAGE_SSHD_REGEN_KEYS
+	select PACKAGE_ISAR_CI_SSH_SETUP
+	help
+	  This image includes is for running CI. Via isar-ci-ssh-setup recipe.
+	  It creates ci user with non-interactive ssh access to the board.
+
 menuconfig IMAGE_INSTALLER
 	bool "Installer image"
 	help
@@ -44,6 +52,7 @@  config KAS_INCLUDE_IMAGE
 	string
 	default "kas/image/isar-image-base.yaml" if IMAGE_BASE
 	default "kas/image/isar-image-debug.yaml" if IMAGE_DEBUG
+	default "kas/image/isar-image-ci.yaml" if IMAGE_CI
 	default "kas/image/isar-image-installer.yaml" if IMAGE_INSTALLER
 
 endmenu
diff --git a/kas/image/isar-image-ci.yaml b/kas/image/isar-image-ci.yaml
new file mode 100644
index 00000000..20c381b5
--- /dev/null
+++ b/kas/image/isar-image-ci.yaml
@@ -0,0 +1,7 @@ 
+# This software is a part of Isar.
+# Copyright (C) 2024 ilbers GmbH
+
+header:
+  version: 14
+
+target: isar-image-ci
diff --git a/kas/isar.yaml b/kas/isar.yaml
index df26b780..16ce8b42 100644
--- a/kas/isar.yaml
+++ b/kas/isar.yaml
@@ -1,5 +1,5 @@ 
-# This software is a part of ISAR.
-# Copyright (C) 2023 ilbers GmbH
+# This software is a part of Isar.
+# Copyright (C) 2023-2024 ilbers GmbH
 
 header:
   version: 14
@@ -11,6 +11,7 @@  repos:
     layers:
       meta:
       meta-isar:
+      meta-test:
 
 bblayers_conf_header:
   standard: |
diff --git a/kas/package/Kconfig b/kas/package/Kconfig
index af4c5137..35ba7cf1 100644
--- a/kas/package/Kconfig
+++ b/kas/package/Kconfig
@@ -1,5 +1,5 @@ 
-# This software is a part of ISAR.
-# Copyright (C) 2023 ilbers GmbH
+# This software is a part of Isar.
+# Copyright (C) 2023-2024 ilbers GmbH
 #
 # Authors:
 #  Uladzimir Bely <ubely@ilbers.de>
@@ -137,6 +137,15 @@  config KAS_INCLUDE_PACKAGE_SSHD_REGEN_KEYS
         default "kas/package/pkg_sshd-regen-keys.yaml"
         depends on PACKAGE_SSHD_REGEN_KEYS
 
+config PACKAGE_ISAR_CI_SSH_SETUP
+        bool "isar-ci-ssh-setup"
+        default n
+
+config KAS_INCLUDE_PACKAGE_ISAR_CI_SSH_SETUP
+        string
+        default "kas/package/pkg_sshd-regen-keys.yaml"
+        depends on PACKAGE_ISAR_CI_SSH_SETUP
+
 endmenu
 
 config KAS_IMAGE_PREINSTALL
diff --git a/kas/package/pkg_isar-ci-ssh-setup.yaml b/kas/package/pkg_isar-ci-ssh-setup.yaml
new file mode 100644
index 00000000..bf771b63
--- /dev/null
+++ b/kas/package/pkg_isar-ci-ssh-setup.yaml
@@ -0,0 +1,9 @@ 
+# This software is a part of Isar.
+# Copyright (C) 2024 ilbers GmbH
+
+header:
+  version: 14
+
+local_conf_header:
+  package-isar-ci-ssh-setup: |
+    IMAGE_INSTALL:append = " isar-ci-ssh-setup"
diff --git a/meta-test/recipes-ci/images/isar-image-ci.bb b/meta-test/recipes-core/images/isar-image-ci.bb
similarity index 100%
rename from meta-test/recipes-ci/images/isar-image-ci.bb
rename to meta-test/recipes-core/images/isar-image-ci.bb
diff --git a/scripts/generate_yaml.sh b/scripts/generate_yaml.sh
index 8e8651a0..aaa8bcba 100755
--- a/scripts/generate_yaml.sh
+++ b/scripts/generate_yaml.sh
@@ -78,7 +78,7 @@  done
 # Scan for image recipes, except:
 # - "isar-image-installer" having more complex structure
 
-IMAGES=$(find {meta,meta-isar}/recipes-core/images -iname *.bb -printf "%f\n" \
+IMAGES=$(find {meta,meta-isar,meta-test}/recipes-core/images -iname *.bb -printf "%f\n" \
   | sed -e 's/.bb$//' | grep -v "isar-image-installer"| sort)
 
 for image in ${IMAGES}