mirror of
https://github.com/jmcorgan/fips.git
synced 2026-07-22 07:48:26 +00:00
e4a854f6b0
Two runs on one host destroyed each other's containers, producing mid-test "No such container" failures that look like real defects. The automated builder runs a full local CI on the same box every few minutes, so the machine is contended almost always and this has red-ed both a hand run and an automated gate. Two independent causes are fixed here. Container names were hardcoded, and docker names are global rather than scoped by compose project, so two runs collided on the same name; every name now takes an optional suffix that the harness sets from the run id. And the cleanup sweep matched a label shared by every run, so one run's teardown force-removed another's containers; resources now also carry a per-run label and the sweep can be narrowed to it. A third hazard turned up that was not in the original report: the sidecar suite passes explicit compose project names, which override the run-scoped project and put it outside the shared prefix entirely. Its project names, network, and derived container references are now scoped too. Both are default-off. With the suffix unset, names render exactly as they do today and a bare compose invocation is unchanged, which is what keeps the hosted CI and the documentation correct. A cleanup run with no run id still reaps everything, which is what a manual "clear the box" wants. The literal-name sweep was not sufficient: six scripts build container names dynamically from node labels, and two suites create their own containers outside compose. Those are handled at their construction sites. Verified: syntax check on all modified scripts; compose validation on every modified file with the suffix both set and unset; and a synthetic two-run reproduction that shows the old cleanup destroying a bystander run and the new one leaving it alone. Known gap: subnets are still hardcoded, so two concurrent full runs will still collide on address-pool overlap. That fix reaches into topology configs, chaos scenarios, diagrams and production source, so it is left for its own change rather than half-done here.
49 lines
1.1 KiB
YAML
49 lines
1.1 KiB
YAML
# Minimal 2-node boringtun setup for iperf3 throughput comparison.
|
|
# Both containers join the same docker bridge; each runs a boringtun
|
|
# userspace WireGuard tunnel and they peer with each other over UDP.
|
|
# Inner WG IPs: 10.99.0.1/24 (alice) <-> 10.99.0.2/24 (bob).
|
|
|
|
networks:
|
|
bt-net:
|
|
driver: bridge
|
|
labels:
|
|
- "com.corganlabs.fips-ci=1"
|
|
ipam:
|
|
config:
|
|
- subnet: 172.99.0.0/24
|
|
|
|
x-boringtun-common: &boringtun-common
|
|
image: boringtun-test:latest
|
|
cap_add:
|
|
- NET_ADMIN
|
|
devices:
|
|
- /dev/net/tun:/dev/net/tun
|
|
sysctls:
|
|
- net.ipv4.conf.all.forwarding=1
|
|
restart: "no"
|
|
env_file:
|
|
- ./generated/peers.env
|
|
|
|
services:
|
|
alice:
|
|
<<: *boringtun-common
|
|
container_name: bt-alice${FIPS_CI_NAME_SUFFIX:-}
|
|
hostname: alice
|
|
environment:
|
|
- ROLE=alice
|
|
- PEER_HOST=bob
|
|
networks:
|
|
bt-net:
|
|
ipv4_address: 172.99.0.10
|
|
|
|
bob:
|
|
<<: *boringtun-common
|
|
container_name: bt-bob${FIPS_CI_NAME_SUFFIX:-}
|
|
hostname: bob
|
|
environment:
|
|
- ROLE=bob
|
|
- PEER_HOST=alice
|
|
networks:
|
|
bt-net:
|
|
ipv4_address: 172.99.0.11
|