vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-06 13:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: share docker e2e instance helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-29 01:17:15 +01:00
parent 6249c32826
commit 3286e99bc2
5 changed files with 89 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
scripts/e2e/cron-mcp-cleanup-docker.sh
View File

@@ -40,68 +40,37 @@ docker run --rm \
"${DOCKER_E2E_HARNESS_ARGS[@]}" \
"$IMAGE_NAME" \
bash -lc "set -euo pipefail
eval \"\$(printf '%s' \"\${OPENCLAW_TEST_STATE_SCRIPT_B64:?missing OPENCLAW_TEST_STATE_SCRIPT_B64}\" | base64 -d)\"
entry=dist/index.mjs
[ -f \"\$entry\" ] || entry=dist/index.js
source scripts/lib/openclaw-e2e-instance.sh
openclaw_e2e_eval_test_state_from_b64 \"\${OPENCLAW_TEST_STATE_SCRIPT_B64:?missing OPENCLAW_TEST_STATE_SCRIPT_B64}\"
entry=\"\$(openclaw_e2e_resolve_entrypoint)\"
export MOCK_PORT=44081
export SUCCESS_MARKER=OPENCLAW_CRON_MCP_CLEANUP_OK
export MOCK_REQUEST_LOG=/tmp/openclaw-cron-mock-openai-requests.jsonl
export OPENCLAW_DOCKER_OPENAI_BASE_URL=\"http://127.0.0.1:\$MOCK_PORT/v1\"
node scripts/e2e/mock-openai-server.mjs >/tmp/cron-mcp-cleanup-mock-openai.log 2>&1 &
mock_pid=\$!
tsx scripts/e2e/cron-mcp-cleanup-seed.ts >/tmp/cron-mcp-cleanup-seed.log
node \"\$entry\" gateway --port $PORT --bind loopback --allow-unconfigured >/tmp/cron-mcp-cleanup-gateway.log 2>&1 &
gateway_pid=\$!
stop_process() {
pid=\"\$1\"
kill \"\$pid\" >/dev/null 2>&1 || true
for _ in \$(seq 1 40); do
if ! kill -0 \"\$pid\" >/dev/null 2>&1; then
wait \"\$pid\" >/dev/null 2>&1 || true
return
fi
sleep 0.25
done
kill -9 \"\$pid\" >/dev/null 2>&1 || true
wait \"\$pid\" >/dev/null 2>&1 || true
}
mock_pid=\"\$(openclaw_e2e_start_mock_openai \"\$MOCK_PORT\" /tmp/cron-mcp-cleanup-mock-openai.log)\"
gateway_pid=
cleanup_inner() {
stop_process \"\$mock_pid\"
stop_process \"\$gateway_pid\"
openclaw_e2e_stop_process \"\${gateway_pid:-}\"
openclaw_e2e_stop_process \"\${mock_pid:-}\"
}
dump_gateway_log_on_error() {
status=\$?
if [ \"\$status\" -ne 0 ]; then
tail -n 80 /tmp/cron-mcp-cleanup-gateway.log 2>/dev/null || true
cat /tmp/cron-mcp-cleanup-seed.log 2>/dev/null || true
cat /tmp/cron-mcp-cleanup-mock-openai.log 2>/dev/null || true
cat \"\$MOCK_REQUEST_LOG\" 2>/dev/null || true
openclaw_e2e_dump_logs \
/tmp/cron-mcp-cleanup-gateway.log \
/tmp/cron-mcp-cleanup-seed.log \
/tmp/cron-mcp-cleanup-mock-openai.log \
\"\$MOCK_REQUEST_LOG\"
fi
cleanup_inner
exit \"\$status\"
}
trap cleanup_inner EXIT
trap dump_gateway_log_on_error ERR
for _ in \$(seq 1 80); do
if node -e \"fetch('http://127.0.0.1:' + process.env.MOCK_PORT + '/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))\"; then
break
fi
sleep 0.1
done
node -e \"fetch('http://127.0.0.1:' + process.env.MOCK_PORT + '/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))\"
gateway_ready=0
for _ in \$(seq 1 300); do
if grep -q '\[gateway\] ready' /tmp/cron-mcp-cleanup-gateway.log 2>/dev/null; then
gateway_ready=1
break
fi
sleep 0.25
done
if [ \"\$gateway_ready\" -ne 1 ]; then
echo \"Gateway did not become ready\"
tail -n 120 /tmp/cron-mcp-cleanup-gateway.log 2>/dev/null || true
exit 1
fi
openclaw_e2e_wait_mock_openai \"\$MOCK_PORT\"
tsx scripts/e2e/cron-mcp-cleanup-seed.ts >/tmp/cron-mcp-cleanup-seed.log
gateway_pid=\"\$(openclaw_e2e_start_gateway \"\$entry\" $PORT /tmp/cron-mcp-cleanup-gateway.log)\"
openclaw_e2e_wait_gateway_ready \"\$gateway_pid\" /tmp/cron-mcp-cleanup-gateway.log 300
tsx scripts/e2e/cron-mcp-cleanup-docker-client.ts
" >"$CLIENT_LOG" 2>&1
status=${PIPESTATUS[0]}

65
scripts/e2e/mcp-channels-docker.sh
View File

@@ -40,69 +40,34 @@ docker run --rm \
"${DOCKER_E2E_HARNESS_ARGS[@]}" \
"$IMAGE_NAME" \
bash -lc "set -euo pipefail
eval \"\$(printf '%s' \"\${OPENCLAW_TEST_STATE_SCRIPT_B64:?missing OPENCLAW_TEST_STATE_SCRIPT_B64}\" | base64 -d)\"
entry=dist/index.mjs
[ -f \"\$entry\" ] || entry=dist/index.js
source scripts/lib/openclaw-e2e-instance.sh
openclaw_e2e_eval_test_state_from_b64 \"\${OPENCLAW_TEST_STATE_SCRIPT_B64:?missing OPENCLAW_TEST_STATE_SCRIPT_B64}\"
entry=\"\$(openclaw_e2e_resolve_entrypoint)\"
mock_port=44081
export OPENCLAW_DOCKER_OPENAI_BASE_URL=\"http://127.0.0.1:\$mock_port/v1\"
MOCK_PORT=\"\$mock_port\" node scripts/e2e/mock-openai-server.mjs >/tmp/mcp-channels-mock-openai.log 2>&1 &
mock_pid=\$!
for _ in \$(seq 1 80); do
if node -e \"fetch('http://127.0.0.1:' + process.argv[1] + '/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))\" \"\$mock_port\"; then
break
fi
sleep 0.1
done
node -e \"fetch('http://127.0.0.1:' + process.argv[1] + '/health').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))\" \"\$mock_port\"
tsx scripts/e2e/mcp-channels-seed.ts >/tmp/mcp-channels-seed.log
node \"\$entry\" gateway --port $PORT --bind loopback --allow-unconfigured >/tmp/mcp-channels-gateway.log 2>&1 &
gateway_pid=\$!
stop_process() {
pid=\"\$1\"
kill \"\$pid\" >/dev/null 2>&1 || true
for _ in \$(seq 1 40); do
if ! kill -0 \"\$pid\" >/dev/null 2>&1; then
wait \"\$pid\" >/dev/null 2>&1 || true
return
fi
sleep 0.25
done
kill -9 \"\$pid\" >/dev/null 2>&1 || true
wait \"\$pid\" >/dev/null 2>&1 || true
}
mock_pid=\"\$(openclaw_e2e_start_mock_openai \"\$mock_port\" /tmp/mcp-channels-mock-openai.log)\"
gateway_pid=
cleanup_inner() {
stop_process \"\$gateway_pid\"
stop_process \"\$mock_pid\"
openclaw_e2e_stop_process \"\${gateway_pid:-}\"
openclaw_e2e_stop_process \"\${mock_pid:-}\"
}
dump_gateway_log_on_error() {
status=\$?
if [ \"\$status\" -ne 0 ]; then
tail -n 80 /tmp/mcp-channels-gateway.log 2>/dev/null || true
openclaw_e2e_dump_logs \
/tmp/mcp-channels-gateway.log \
/tmp/mcp-channels-seed.log \
/tmp/mcp-channels-mock-openai.log
fi
cleanup_inner
exit \"\$status\"
}
trap cleanup_inner EXIT
trap dump_gateway_log_on_error ERR
gateway_ready=0
for _ in \$(seq 1 480); do
if ! kill -0 \"\$gateway_pid\" >/dev/null 2>&1; then
echo \"Gateway exited before becoming ready\"
wait \"\$gateway_pid\" || true
tail -n 120 /tmp/mcp-channels-gateway.log 2>/dev/null || true
exit 1
fi
if grep -q '\[gateway\] ready' /tmp/mcp-channels-gateway.log 2>/dev/null; then
gateway_ready=1
break
fi
sleep 0.25
done
if [ \"\$gateway_ready\" -ne 1 ]; then
echo \"Gateway did not become ready\"
tail -n 120 /tmp/mcp-channels-gateway.log 2>/dev/null || true
exit 1
fi
openclaw_e2e_wait_mock_openai \"\$mock_port\"
tsx scripts/e2e/mcp-channels-seed.ts >/tmp/mcp-channels-seed.log
gateway_pid=\"\$(openclaw_e2e_start_gateway \"\$entry\" $PORT /tmp/mcp-channels-gateway.log)\"
openclaw_e2e_wait_gateway_ready \"\$gateway_pid\" /tmp/mcp-channels-gateway.log 480
tsx scripts/e2e/mcp-channels-docker-client.ts
" >"$CLIENT_LOG" 2>&1
status=${PIPESTATUS[0]}