Repository navigation
Commit f1df1f5
committed
fix(tests): make the container lane work from the Makefile's cwd
Both bugs were invisible until CI ran the lane through its real entry
point. The spike invoked hack/e2e-container-up.sh by hand from the repo
root, and every path it needed happened to resolve from there.
COMPOSE_FILE defaulted to a cwd-relative hack/e2e-compose.yaml, but the
Makefile target runs from packages/core/testing, where no hack/ exists:
open .../packages/core/testing/hack/e2e-compose.yaml: no such file
Resolve it from the script's own location instead, so the Makefile path
and a contributor running the script directly both work.
The retry path then exposed the second one. compose interpolates the
whole file before deciding what the subcommand needs, so the
`${USERDATA:?}` guard that makes a missing machine config fail loudly on
`up` also failed `down`, where no machine config is required:
error while interpolating x-node.environment.USERDATA: required
variable USERDATA is missing a value
`|| true` swallowed that, so delete-cluster-container never removed
anything and the nodes and their /var volumes would have survived into
the next run -- the half-dead cluster the target exists to prevent. Pass
a placeholder, which `down` never reads because it matches containers by
project and service name, and keep the guard armed for `up`.
Assisted-By: Claude <[email protected]>
Signed-off-by: Myasnikov Daniil <[email protected]>1 parent 0772de9 commit f1df1f5
2 files changed
Lines changed: 16 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
21 | 28 | | |
22 | 29 | | |
23 | 30 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
61 | 68 | | |
62 | | - | |
| 69 | + | |
63 | 70 | | |
64 | 71 | | |
65 | 72 | | |
| |||
0 commit comments