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

greengrass-bin: fix ptest, by disable use in corretto-11-bin #10923

Merged
merged 1 commit into from
Dec 23, 2024
Merged

greengrass-bin: fix ptest, by disable use in corretto-11-bin #10923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 0 additions & 13 deletions recipes-devtools/amazon-corretto/corretto-11-bin/run-ptest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 0 additions & 3 deletions recipes-iot/aws-iot-greengrass/greengrass-bin_2.14.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 0 additions & 4 deletions recipes-iot/aws-iot-greengrass/greengrass-lite_2.0.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Loading