Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Changes from kanto auto deployer branch to main #21

Merged
merged 9 commits into from
Dec 9, 2022
Merged

Changes from kanto auto deployer branch to main #21

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3be804
Update of Cargo.lock for kanto-auto-deployer
stlachev Dec 6, 2022
4e378e4
Merge branch 'main' of https://github.com/SoftwareDefinedVehicle/meta…
stlachev Dec 6, 2022
61651ed
Update commit hash for sdv-utils
vasilvas99 Dec 7, 2022
0da5d83
New containers sua, vum, seatservice
stlachev Dec 8, 2022
cdf1f39
Merge pull request #58 from SoftwareDefinedVehicle/sdv-utils-hash
mikehaller Dec 9, 2022
e58f082
kanto-auto-deployer new SRCREV with usage
stlachev Dec 9, 2022
49d8a63
Merge branch 'main' into kanto-auto-deployer
stlachev Dec 9, 2022
a871934
Changes in SUA container
stlachev Dec 9, 2022
0843d07
LOG_LEVEL=INFO
stlachev Dec 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions meta-leda-components/recipes-sdv/eclipse-leda/kanto-auto-deployer_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ inherit cargo kanto-auto-deployer
RDEPENDS_${PN} += " grpc protobuf nativesdk-protobuf"
DEPENDS += " protobuf protobuf-native grpc git-native"

SRCREV = "e4882a8e64f6d172f212a241c58aa66e58faa741"
PV:append = ".AUTOINC+e4882a8e64f"
SRCREV = "467e4cebd86dcfee686b1e676ed0f30ca741354a"
PV:append = ".AUTOINC+467e4cebd86"
SRC_URI = "gitsm://github.com/eclipse-leda/leda-utils;protocol=https;nobranch=0;branch=main"

S = "${WORKDIR}/git"
Expand Down
2 changes: 1 addition & 1 deletion meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/databroker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"hooks": [],
"host_config": {
"devices": [],
"network_mode": "host",
"network_mode": "bridge",
"privileged": false,
"restart_policy": {
"maximum_retry_count": 0,
Expand Down
81 changes: 81 additions & 0 deletions meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/seatservice.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"id": "",
"name": "seatservice",
"image": {
"name": "ghcr.io/eclipse/kuksa.val.services/seat_service:v0.1.0",
"decrypt_config": null
},
"host_name": "",
"domain_name": "",
"resolv_conf_path": "",
"hosts_path": "",
"hostname_path": "",
"mounts": [],
"hooks": [],
"host_config": {
"devices": [],
"network_mode": "bridge",
"privileged": false,
"restart_policy": {
"maximum_retry_count": 0,
"retry_timeout": 0,
"type": "unless-stopped"
},
"runtime": "io.containerd.runc.v2",
"extra_hosts": [],
"port_mappings": [
{
"protocol": "tcp",
"container_port": 50051,
"host_ip": "localhost",
"host_port": 50051,
"host_port_end": 50051
}
],
"log_config": {
"driver_config": {
"type": "json-file",
"max_files": 2,
"max_size": "100M",
"root_dir": ""
},
"mode_config": {
"mode": "blocking",
"max_buffer_size": ""
}
},
"resources": null
},
"io_config": {
"attach_stderr": false,
"attach_stdin": false,
"attach_stdout": false,
"open_stdin": false,
"stdin_once": false,
"tty": false
},
"config": {
"env": [
"VEHICLEDATABROKER_DAPR_APP_ID=vehicledatabroker"
],
"cmd": []
},
"network_settings": null,
"state": {
"pid": -1,
"started_at": "",
"error": "",
"exit_code": 0,
"finished_at": "",
"exited": false,
"dead": false,
"restarting": false,
"paused": false,
"running": false,
"status": "",
"oom_killed": false
},
"created": "",
"manually_stopped": false,
"restart_count": 0
}
95 changes: 95 additions & 0 deletions meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/sua.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
{
"id": "",
"name": "sua",
"image": {
"name": "ghcr.io/eclipse-leda/leda-contrib-self-update-agent/sua:testing",
"decrypt_config": null
},
"host_name": "",
"domain_name": "",
"resolv_conf_path": "",
"hosts_path": "",
"hostname_path": "",
"mounts": [
{
"source": "/var/run/dbus/system_bus_socket",
"destination": "/var/run/dbus/system_bus_socket",
"propagation_mode": "rprivate"
},
{
"source": "/data_temp/selfupdates",
"destination": "/RaucUpdate",
"propagation_mode": "rprivate"
}
],
"hooks": [],
"host_config": {
"devices": [],
"network_mode": "bridge",
"privileged": false,
"restart_policy": {
"maximum_retry_count": 0,
"retry_timeout": 0,
"type": "unless-stopped"
},
"runtime": "io.containerd.runc.v2",
"extra_hosts": [
"mosquitto:host_ip"
],
"port_mappings": [
{
"protocol": "tcp",
"container_port": 50052,
"host_ip": "localhost",
"host_port": 50052,
"host_port_end": 50052
}
],
"log_config": {
"driver_config": {
"type": "json-file",
"max_files": 2,
"max_size": "100M",
"root_dir": ""
},
"mode_config": {
"mode": "blocking",
"max_buffer_size": ""
}
},
"resources": null
},
"io_config": {
"attach_stderr": false,
"attach_stdin": false,
"attach_stdout": false,
"open_stdin": false,
"stdin_once": false,
"tty": false
},
"config": {
"env": [
"MQTT_CONN_BROKER=tcp://mosquitto:1883",
"LOG_LEVEL=DEBUG"
mikehaller marked this conversation as resolved.
Show resolved Hide resolved
],
"cmd": []
},
"network_settings": null,
"state": {
"pid": -1,
"started_at": "",
"error": "",
"exit_code": 0,
"finished_at": "",
"exited": false,
"dead": false,
"restarting": false,
"paused": false,
"running": false,
"status": "",
"oom_killed": false
},
"created": "",
"manually_stopped": false,
"restart_count": 0
}
78 changes: 78 additions & 0 deletions meta-leda-components/recipes-sdv/eclipse-leda/kanto-containers/vum.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
{
"id": "",
"name": "vum",
"image": {
"name": "ghcr.io/eclipse-leda/leda-contrib-vehicle-update-manager/vehicleupdatemanager:main-1d8dca55a755c4b3c7bc06eabfa06ad49e068a48",
"decrypt_config": null
},
"host_name": "",
"domain_name": "",
"resolv_conf_path": "",
"hosts_path": "",
"hostname_path": "",
"mounts": [],
"hooks": [],
"host_config": {
"devices": [],
"network_mode": "bridge",
"privileged": false,
"restart_policy": {
"maximum_retry_count": 0,
"retry_timeout": 0,
"type": "unless-stopped"
},
"runtime": "io.containerd.runc.v2",
"extra_hosts": [
"mosquitto:host_ip"
],
"port_mappings": [],
"log_config": {
"driver_config": {
"type": "json-file",
"max_files": 2,
"max_size": "100M",
"root_dir": ""
},
"mode_config": {
"mode": "blocking",
"max_buffer_size": ""
}
},
"resources": null
},
"io_config": {
"attach_stderr": false,
"attach_stdin": false,
"attach_stdout": false,
"open_stdin": false,
"stdin_once": false,
"tty": false
},
"config": {
"env": [
"MQTT_CONN_BROKER=tcp://mosquitto:1883",
"LOG_LEVEL=DEBUG",
mikehaller marked this conversation as resolved.
Show resolved Hide resolved
"SELF_UPDATE_TIMEOUT=30m",
"SELF_UPDATE_ENABLE_REBOOT=true"
],
"cmd": []
},
"network_settings": null,
"state": {
"pid": -1,
"started_at": "",
"error": "",
"exit_code": 0,
"finished_at": "",
"exited": false,
"dead": false,
"restarting": false,
"paused": false,
"running": false,
"status": "",
"oom_killed": false
},
"created": "",
"manually_stopped": false,
"restart_count": 0
}
11 changes: 11 additions & 0 deletions meta-leda-components/recipes-sdv/eclipse-leda/sdv-default-containers.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,22 @@ SRC_URI += "file://LICENSE"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"

# Will be changed for sua.json as well and be separated in a different recipe
SUA_DATA_DIR = "/data_temp/selfupdates"

do_install:append() {
install -d ${D}${KANTO_MANIFESTS_DIR}
install ${THISDIR}/kanto-containers/databroker.json ${D}${KANTO_MANIFESTS_DIR}
install ${THISDIR}/kanto-containers/seatservice.json ${D}${KANTO_MANIFESTS_DIR}
install ${THISDIR}/kanto-containers/vum.json ${D}${KANTO_MANIFESTS_DIR}
mkdir -p ${D}${SUA_DATA_DIR}
install ${THISDIR}/kanto-containers/sua.json ${D}${KANTO_MANIFESTS_DIR}
}

PACKAGES = "${PN}"
FILES:${PN} += "${KANTO_MANIFESTS_DIR}/databroker.json"
FILES:${PN} += "${KANTO_MANIFESTS_DIR}/seatservice.json"
FILES:${PN} += "${KANTO_MANIFESTS_DIR}/vum.json"
FILES:${PN} += "${SUA_DATA_DIR}"
FILES:${PN} += "${KANTO_MANIFESTS_DIR}/sua.json"

2 changes: 1 addition & 1 deletion meta-leda-components/recipes-sdv/sdv-base/sdv-core-utils_0.1.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ SUMMARY = "SDV Core Utilities"
DESCRIPTION = "Core shell scripts"

SRC_URI = "git://github.com/eclipse-leda/leda-utils;branch=main;protocol=https"
SRCREV = "586ef6da1b841efd76fb06b9821bae4277e325e0"
SRCREV = "c816c3a75dcc41a2962d34730b9fd0bc0084c79d"

# According to https://wiki.yoctoproject.org/wiki/License_Infrastructure_Interest_Group
LICENSE = "Apache-2.0"
Expand Down