greengrass-bin: fix ptest, 3rd try

Stopping of autostarted greengrass-bin from systemd.
aws4embeddedlinux · Dec 20, 2024 · 9f1b9d0 · 9f1b9d0
1 parent 8cf344c
commit 9f1b9d0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/recipes-iot/aws-iot-greengrass/files/run-ptest b/recipes-iot/aws-iot-greengrass/files/run-ptest
@@ -1,6 +1,11 @@
 #!/bin/sh
 set -euxo pipefail
 
+# Cause we starting this in the ptest separate.
+systemctl stop greengrass
+# some settle time
+sleep 10
+
 cd /greengrass/v2/alts/current/distro/bin
 chmod 755 loader
 ./loader  2>&1 > test.log &

diff --git a/recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest b/recipes-iot/aws-iot-greengrass/greengrass-lite/run-ptest
@@ -3,7 +3,6 @@ set -euxo pipefail
 
 # this has been disabled cause this has issues with greengrass-bin
 systemctl enable ggl.gg-ipc.socket.socket
-systemctl enable ggl.ipc_component.socket
 systemctl start greengrass-lite.target
 
 # settle time

diff --git a/recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb b/recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb
@@ -125,7 +125,6 @@ do_install:append() {
 # disable automatic startup of gg-lite, cause this will use the same port as greengrass-bin, conflicting.
 SYSTEMD_SERVICE:${PN}-ptest:remove = "greengrass-lite.target"
 SYSTEMD_SERVICE:${PN}-ptest:remove = "ggl.gg-ipc.socket.socket"
-SYSTEMD_SERVICE:${PN}-ptest:remove = "ggl.ipc_component.socket"
 
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM:${PN} = "-r ${gg_group}; -r ${ggc_group}"