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

refactor: simplify docker e2e helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-04-29 09:09:34 +01:00
parent b85cf280c7
commit 2c0449571c
22 changed files with 962 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
scripts/e2e/openwebui-docker.sh
View File

@@ -24,10 +24,6 @@ OW_NAME="openclaw-openwebui-$$"
DOCKER_COMMAND_TIMEOUT="${OPENCLAW_OPENWEBUI_DOCKER_COMMAND_TIMEOUT:-600s}"
DOCKER_PULL_TIMEOUT="${OPENCLAW_OPENWEBUI_DOCKER_PULL_TIMEOUT:-600s}"
docker_cmd() {
timeout "$DOCKER_COMMAND_TIMEOUT" "$@"
}
OPENAI_API_KEY_VALUE="${OPENAI_API_KEY:-}"
if [[ "$OPENAI_API_KEY_VALUE" == "undefined" || "$OPENAI_API_KEY_VALUE" == "null" ]]; then
OPENAI_API_KEY_VALUE=""
@@ -42,9 +38,9 @@ if [[ -z "$OPENAI_API_KEY_VALUE" ]]; then
fi
cleanup() {
docker_cmd docker rm -f "$OW_NAME" >/dev/null 2>&1 || true
docker_cmd docker rm -f "$GW_NAME" >/dev/null 2>&1 || true
docker_cmd docker network rm "$NET_NAME" >/dev/null 2>&1 || true
docker_e2e_docker_cmd rm -f "$OW_NAME" >/dev/null 2>&1 || true
docker_e2e_docker_cmd rm -f "$GW_NAME" >/dev/null 2>&1 || true
docker_e2e_docker_cmd network rm "$NET_NAME" >/dev/null 2>&1 || true
}
trap cleanup EXIT
@@ -54,12 +50,12 @@ echo "Pulling Open WebUI image: $OPENWEBUI_IMAGE"
timeout "$DOCKER_PULL_TIMEOUT" docker pull "$OPENWEBUI_IMAGE" >/dev/null
echo "Creating Docker network..."
docker_cmd docker network create "$NET_NAME" >/dev/null
docker_e2e_docker_cmd network create "$NET_NAME" >/dev/null
echo "Starting gateway container..."
# Harness files are mounted read-only; the app under test comes from /app/dist.
docker_e2e_harness_mount_args
docker_cmd docker run -d \
docker_e2e_docker_cmd run -d \
"${DOCKER_E2E_HARNESS_ARGS[@]}" \
--name "$GW_NAME" \
--network "$NET_NAME" \
@@ -124,12 +120,7 @@ EOF
' >/dev/null
echo "Waiting for gateway HTTP surface..."
if ! docker_e2e_wait_container_bash_while_running "$OW_NAME" "$GW_NAME" 240 1 "node --input-type=module -e '
const res = await fetch(\"http://127.0.0.1:$PORT/v1/models\", {
headers: { authorization: \"Bearer $TOKEN\" },
}).catch(() => null);
process.exit(res?.status === 200 ? 0 : 1);
'"; then
if ! docker_e2e_wait_container_bash "$GW_NAME" 240 1 "OPENCLAW_HTTP_PROBE_BEARER='$TOKEN' node scripts/e2e/lib/openwebui/http-probe.mjs 'http://127.0.0.1:$PORT/v1/models' 200"; then
echo "Gateway failed to start"
docker_e2e_docker_cmd inspect "$GW_NAME" --format '{{json .State}}' 2>/dev/null || true
docker_e2e_tail_container_file_if_running "$GW_NAME" /tmp/openwebui-gateway.log 200
@@ -137,7 +128,7 @@ if ! docker_e2e_wait_container_bash_while_running "$OW_NAME" "$GW_NAME" 240 1 "n
fi
echo "Starting Open WebUI container..."
docker_cmd docker run -d \
docker_e2e_docker_cmd run -d \
--name "$OW_NAME" \
--network "$NET_NAME" \
-e ENV=prod \
@@ -161,31 +152,14 @@ docker_cmd docker run -d \
"$OPENWEBUI_IMAGE" >/dev/null
echo "Waiting for Open WebUI..."
if ! docker_e2e_wait_container_bash "$GW_NAME" 240 1 "node --input-type=module -e '
const res = await fetch(\"http://$OW_NAME:$WEBUI_PORT/\").catch(() => null);
process.exit(res && res.status < 500 ? 0 : 1);
'"; then
if ! docker_e2e_wait_container_bash_while_running "$OW_NAME" "$GW_NAME" 240 1 "node scripts/e2e/lib/openwebui/http-probe.mjs 'http://$OW_NAME:$WEBUI_PORT/' lt500"; then
echo "Open WebUI failed to start"
docker_e2e_docker_cmd logs "$OW_NAME" 2>&1 | tail -n 200 || true
exit 1
fi
echo "Waiting for gateway model endpoint after Open WebUI startup..."
if ! docker_e2e_wait_container_bash "$GW_NAME" 90 5 "node --input-type=module -e '
const controller = new AbortController();
const timeout = setTimeout(() => controller.abort(), 8000);
try {
const res = await fetch(\"http://$GW_NAME:$PORT/v1/models\", {
headers: { authorization: \"Bearer $TOKEN\" },
signal: controller.signal,
});
process.exit(res.status === 200 ? 0 : 1);
} catch {
process.exit(1);
} finally {
clearTimeout(timeout);
}
'"; then
if ! docker_e2e_wait_container_bash "$GW_NAME" 90 5 "OPENCLAW_HTTP_PROBE_BEARER='$TOKEN' OPENCLAW_HTTP_PROBE_TIMEOUT_MS=8000 node scripts/e2e/lib/openwebui/http-probe.mjs 'http://$GW_NAME:$PORT/v1/models' 200"; then
echo "Gateway model endpoint did not stay reachable after Open WebUI startup"
docker_e2e_docker_cmd inspect "$GW_NAME" --format '{{json .State}}' 2>/dev/null || true
docker_e2e_tail_container_file_if_running "$GW_NAME" /tmp/openwebui-gateway.log 200
@@ -194,7 +168,7 @@ if ! docker_e2e_wait_container_bash "$GW_NAME" 90 5 "node --input-type=module -e
fi
echo "Running Open WebUI -> OpenClaw smoke..."
if ! docker_cmd docker exec \
if ! docker_e2e_docker_cmd exec \
-e "OPENWEBUI_BASE_URL=http://$OW_NAME:$WEBUI_PORT" \
-e "OPENWEBUI_ADMIN_EMAIL=$ADMIN_EMAIL" \
-e "OPENWEBUI_ADMIN_PASSWORD=$ADMIN_PASSWORD" \