Skip to content

Commit 6bf2e42

Browse files
committed
meta-isar: images: make LAVA an optional feature
Closes: #398 Signed-off-by: Cedric Hombourger <[email protected]>
1 parent 9435b3b commit 6bf2e42

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

.github/wordlist.txt

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ CIDR
2424
config
2525
de
2626
dearmor
27+
debian
2728
dev
2829
DHCP
2930
DNS
@@ -59,6 +60,7 @@ jpc
5960
jpg
6061
jqc
6162
JQC
63+
kas
6264
keyrings
6365
kvm
6466
LEDs
@@ -74,6 +76,7 @@ MTDA's
7476
Mux
7577
MUX
7678
nano
79+
nanopi
7780
NanoPi
7881
neo
7982
netmask
@@ -129,3 +132,4 @@ VLC
129132
VNC
130133
Wi
131134
www
135+
yml

docs/integration.rst

+6-6
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ Sign in to your account with the created superuser. Login should be successful.
111111
Attach to lava-server
112112
~~~~~~~~~~~~~~~~~~~~~
113113

114-
The sample NanoPi NEO image comes with the ``lava-dispatcher`` package
115-
preinstalled. It however needs to be configured to connect to the LAVA server
116-
and logger installed as noted above. You may connect to the MTDA agent using
117-
``ssh`` (default credentials are ``mtda``/``mtda``)::
114+
The sample NanoPi NEO image may be rebuilt with the ``lava-dispatcher`` package
115+
preinstalled using the optional `lava.yml` fragment when building with `kas`::
118116

119-
$ ssh mtda@mtda-for-de0-nano-soc.lan
117+
$ ./kas-container build kas/debian/mtda-nanopi-neo.yml:kas/opt/lava.yml
120118

121-
Create a worker on the lava-server web interface through::
119+
It is also possible to install that package using `apt install`. Once the new
120+
image has been deployed (or required packages installed manually), create a
121+
worker on the lava-server web interface through::
122122
123123
Administration -> Lava Scheduler App -> Worker (Add)
124124

kas/opt/lava.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# ---------------------------------------------------------------------------
2+
# Optional support for LAVA
3+
# ---------------------------------------------------------------------------
4+
#
5+
# This software is a part of MTDA.
6+
# Copyright (C) 2024 Siemens Digital Industries Software
7+
#
8+
# ---------------------------------------------------------------------------
9+
# SPDX-License-Identifier: MIT
10+
# ---------------------------------------------------------------------------
11+
12+
header:
13+
version: 10
14+
15+
local_conf_header:
16+
lava_override: |
17+
OVERRIDES .= ":lava"

meta-isar/recipes-core/images/mtda-image.bb

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ IMAGE_PREINSTALL += " \
6565
IMAGE_INSTALL += "python3-hap-python"
6666

6767
# LAVA support
68-
IMAGE_PREINSTALL += "lava-dispatcher"
68+
IMAGE_PREINSTALL:lava += "lava-dispatcher"
6969

7070
# Expand root file-system
7171
IMAGE_INSTALL:append = " expand-on-first-boot "

0 commit comments

Comments
 (0)