Skip to content

Commit 5bd3b1f

Browse files
committed
greengrass-bin: fix ptest, by disable use in corretto-11-bin
1 parent 9e136e4 commit 5bd3b1f

File tree

3 files changed

+0
-20
lines changed

3 files changed

+0
-20
lines changed

recipes-devtools/amazon-corretto/corretto-11-bin/run-ptest

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,3 @@ if [ $RETVAL -eq 0 ] ; then
1616
else
1717
echo "FAIL: corretto-11-bin startup test"
1818
fi
19-
20-
cd /greengrass/v2/alts/current/distro/bin
21-
chmod 755 loader
22-
./loader 2>&1 > test.log &
23-
sleep 30
24-
grep "Launched Nucleus successfully" test.log
25-
26-
RETVAL=$?
27-
if [ $RETVAL -eq 0 ] ; then
28-
echo "PASS: corretto-11-bin -> greengrass-bin startup test"
29-
else
30-
echo "FAIL: corretto-11-bin -> greengrass-bin startup test"
31-
fi

recipes-iot/aws-iot-greengrass/greengrass-bin_2.14.0.bb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,3 @@ INSANE_SKIP:${PN} += "already-stripped ldflags file-rdeps"
146146
RDEPENDS:${PN}-ptest += "\
147147
greengrass-bin \
148148
"
149-
150-
# disable automatic startup of greengrass, cause we want to monitor the startup.
151-
SYSTEMD_SERVICE:${PN}-ptest:remove = "greengrass.service"

recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,6 @@ do_install:append() {
122122
chown ${gg_user}:${gg_group} ${D}/${gg_workingdir}
123123
}
124124

125-
# disable automatic startup of gg-lite, cause this will use the same port as greengrass-bin, conflicting.
126-
SYSTEMD_SERVICE:${PN}-ptest:remove = "greengrass-lite.target"
127-
SYSTEMD_SERVICE:${PN}-ptest:remove = "ggl.gg-ipc.socket.socket"
128-
129125
USERADD_PACKAGES = "${PN}"
130126
GROUPADD_PARAM:${PN} = "-r ${gg_group}; -r ${ggc_group}"
131127
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}"

0 commit comments

Comments
 (0)