From ed5420310d1ba3f1156e8f80431466f4dded8391 Mon Sep 17 00:00:00 2001
From: Thomas Roos <throos@amazon.de>
Date: Mon, 23 Dec 2024 09:07:12 +0000
Subject: [PATCH] greengrass-bin: fix ptest, by disable use in corretto-11-bin

---
 .../amazon-corretto/corretto-11-bin/run-ptest       | 13 -------------
 .../aws-iot-greengrass/greengrass-bin_2.14.0.bb     |  3 ---
 .../aws-iot-greengrass/greengrass-lite_2.0.0.bb     |  4 ----
 3 files changed, 20 deletions(-)

diff --git a/recipes-devtools/amazon-corretto/corretto-11-bin/run-ptest b/recipes-devtools/amazon-corretto/corretto-11-bin/run-ptest
index e2c80223d..cff948401 100644
--- a/recipes-devtools/amazon-corretto/corretto-11-bin/run-ptest
+++ b/recipes-devtools/amazon-corretto/corretto-11-bin/run-ptest
@@ -16,16 +16,3 @@ if [ $RETVAL -eq 0 ] ; then
 else
     echo "FAIL: corretto-11-bin startup test"
 fi
-
-cd /greengrass/v2/alts/current/distro/bin
-chmod 755 loader
-./loader  2>&1 > test.log &
-sleep 30
-grep "Launched Nucleus successfully" test.log
-
-RETVAL=$?
-if [ $RETVAL -eq 0 ] ; then
-    echo "PASS: corretto-11-bin -> greengrass-bin startup test"
-else
-    echo "FAIL: corretto-11-bin -> greengrass-bin startup test"
-fi
\ No newline at end of file
diff --git a/recipes-iot/aws-iot-greengrass/greengrass-bin_2.14.0.bb b/recipes-iot/aws-iot-greengrass/greengrass-bin_2.14.0.bb
index 6a384ee7e..13a68f916 100644
--- a/recipes-iot/aws-iot-greengrass/greengrass-bin_2.14.0.bb
+++ b/recipes-iot/aws-iot-greengrass/greengrass-bin_2.14.0.bb
@@ -146,6 +146,3 @@ INSANE_SKIP:${PN} += "already-stripped ldflags file-rdeps"
 RDEPENDS:${PN}-ptest += "\
     greengrass-bin \
     "
-
-# disable automatic startup of greengrass, cause we want to monitor the startup.
-SYSTEMD_SERVICE:${PN}-ptest:remove = "greengrass.service"
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
index 1d7933c35..0dfacae31 100644
--- a/recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb
+++ b/recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb
@@ -122,10 +122,6 @@ do_install:append() {
     chown ${gg_user}:${gg_group} ${D}/${gg_workingdir}
 }
 
-# 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"
-
 USERADD_PACKAGES = "${PN}"
 GROUPADD_PARAM:${PN} = "-r ${gg_group}; -r ${ggc_group}"
 USERADD_PARAM:${PN} = "-r -M -N -g  ${gg_group} -s /bin/false ${gg_user}; -r -M -N -g  ${ggc_group} -s /bin/false ${ggc_user}"