|
@@ -398,20 +398,26 @@ must be FRESH — the harness refuses a used one):
|
|
|
export SPRY_SEED_ADMIN_USERNAME=admin SPRY_SEED_ADMIN_PASSWORD=adminpass123
|
|
export SPRY_SEED_ADMIN_USERNAME=admin SPRY_SEED_ADMIN_PASSWORD=adminpass123
|
|
|
export SADDLE_LLM_BASE_URL=http://127.0.0.1:9999 SADDLE_LLM_MODEL=mock
|
|
export SADDLE_LLM_BASE_URL=http://127.0.0.1:9999 SADDLE_LLM_MODEL=mock
|
|
|
export SADDLE_PROJECTS_ROOT=/tmp/clanker-e2e/workspace
|
|
export SADDLE_PROJECTS_ROOT=/tmp/clanker-e2e/workspace
|
|
|
-export SADDLE_CALLBACK_BASE_URL=http://localhost:8080
|
|
|
|
|
export SPRY_DB_PATH=/tmp/clanker-e2e/web/clanker-saddle.sqlite
|
|
export SPRY_DB_PATH=/tmp/clanker-e2e/web/clanker-saddle.sqlite
|
|
|
export SADDLE_GOAL_RESUME_S=2 # shrink the coalescing window for tests
|
|
export SADDLE_GOAL_RESUME_S=2 # shrink the coalescing window for tests
|
|
|
-./builddir/clanker-saddle 8080 &
|
|
|
|
|
|
|
+./builddir/clanker-saddle 8180 & # 8180 — 8080 is the production port
|
|
|
|
|
|
|
|
SADDLE_WORKSPACE_ROOT=/tmp/clanker-e2e/workspace \
|
|
SADDLE_WORKSPACE_ROOT=/tmp/clanker-e2e/workspace \
|
|
|
../saddle/builddir/src/saddle --port 7100 &
|
|
../saddle/builddir/src/saddle --port 7100 &
|
|
|
|
|
|
|
|
-WEB=http://localhost:8080 SADDLE=http://localhost:7100 \
|
|
|
|
|
|
|
+WEB=http://localhost:8180 SADDLE=http://localhost:7100 \
|
|
|
WORKSPACE=/tmp/clanker-e2e/workspace \
|
|
WORKSPACE=/tmp/clanker-e2e/workspace \
|
|
|
DB_PATH=/tmp/clanker-e2e/web/clanker-saddle.sqlite \
|
|
DB_PATH=/tmp/clanker-e2e/web/clanker-saddle.sqlite \
|
|
|
python3 test/integration_test.py
|
|
python3 test/integration_test.py
|
|
|
```
|
|
```
|
|
|
|
|
|
|
|
|
|
+The e2e callback base URL comes from the mounted `web-config.json`'s
|
|
|
|
|
+`saddle_callback_base_url` key (`http://localhost:8180` for a host run)
|
|
|
|
|
+— the config beats the `SADDLE_CALLBACK_BASE_URL` environment
|
|
|
|
|
+variable, so set it there rather than exporting a second source of
|
|
|
|
|
+truth. The harness-prepared `demo` repo and its bare origin both live
|
|
|
|
|
+on branch `main` (the project registration's default branch matches).
|
|
|
|
|
+
|
|
|
The daemon's `SADDLE_WORKSPACE_ROOT` and the app's
|
|
The daemon's `SADDLE_WORKSPACE_ROOT` and the app's
|
|
|
`SADDLE_PROJECTS_ROOT` point at the SAME directory (the goal clone the
|
|
`SADDLE_PROJECTS_ROOT` point at the SAME directory (the goal clone the
|
|
|
daemon cuts must anchor the worker worktrees — the shared-volume
|
|
daemon cuts must anchor the worker worktrees — the shared-volume
|