Fixes: https://tracker.ceph.com/issues/46110
Signed-off-by: Tiago Melo <tmelo@suse.com>
(cherry picked from commit
e4b8d7eac352eb31fd17e420521aa2c1ce44453f)
Conflicts:
src/pybind/mgr/dashboard/run-frontend-e2e-tests.sh
There was an extra square bracket in octopus that caused the conflict.
This was manually fixed, since the commit that removed it will not be
backported.
case "$DEVICE" in
chrome)
- [ -x "$(command -v google-chrome)" ] || [ -x "$(command -v google-chrome-stable)" ] ] || failed=true
+ [ -x "$(command -v chrome)" ] || [ -x "$(command -v google-chrome)" ] ||
+ [ -x "$(command -v google-chrome-stable)" ] || failed=true
;;
chromium)
- [ -x "$(command -v chromium)" ] || failed=true
+ [ -x "$(command -v chromium)" ] || [ -x "$(command -v chromium-browser)" ] || failed=true
;;
esac
fi