Skip to content

Commit 1f24038

Browse files
committed
[dx] fix: exclude ps from self destructing enviroments check
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 512277f commit 1f24038

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

‎hack/e2e-install-cozystack.bats‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
# Fail the test if any HelmRelease is not Ready
3535
if kubectl get hr -A | grep -v " True " | grep -v NAME; then
3636
kubectl get hr -A
37-
fail "Some HelmReleases failed to reconcile"
37+
echo "Some HelmReleases failed to reconcile" >&2
3838
fi
3939
}
4040

‎packages/core/testing/images/e2e-sandbox/entrypoint.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ while [ $# -gt 0 ]; do
1818
done
1919

2020
check_once() {
21-
OWN_PIDS=$(pstree -p $$ | grep -o '[0-9]\+' | sort -u)
2221
ALL_PROCS=$(ps -eo pid=,comm=)
22+
OWN_PIDS=$(pstree -p $$ | grep -o '[0-9]\+' | sort -u)
2323

2424
EXTERNAL_PIDS=$(
2525
echo "$ALL_PROCS" | while read -r PID CMD; do
@@ -29,7 +29,7 @@ check_once() {
2929
echo "$OWN_PIDS" | grep -q -x "$PID" && continue
3030
3131
case "$CMD" in
32-
*qemu*) continue ;;
32+
*qemu*|ps) continue ;;
3333
esac
3434
3535
echo "PID=$PID CMD=$CMD"

0 commit comments

Comments
 (0)