mirror of
https://github.com/jmcorgan/fips.git
synced 2026-07-22 07:48:26 +00:00
9e63b42bd9
Replace 4 near-identical per-harness Docker setups with unified shared infrastructure. Net result: -463 lines across 55 files, faster CI (8.5 min vs ~13.5 min), 14 scenarios (down from 21). Unified Docker image (testing/docker/): - Single Dockerfile (trixie-slim) with FIPS_TEST_MODE env var for mode dispatch: default, chaos, sidecar, tor-socks5, tor-directory - Single entrypoint.sh with conditional logic per mode - Replaces 5 Dockerfiles, 3 entrypoints, 4 resolv.conf copies Shared build and libraries (testing/scripts/, testing/lib/): - testing/scripts/build.sh: single build script with macOS zigbuild support, replaces 4 per-harness copies - testing/lib/derive_keys.py: shared key derivation module, replaces 3 copies of derive-keys.py - testing/lib/log_analysis.py: shared log analysis extracted from chaos sim/logs.py, with CLI interface and rekey cutover tracking - testing/lib/wait-converge.sh: shared convergence wait helpers (wait_for_links, wait_for_peers) using fipsctl JSON polling Scenario consolidation: - Remove 7 redundant scenarios: tcp-chain (subsumed by tcp-mesh), tcp-only (subsumed by tcp-mesh), chaos-10 (replaced by churn-mixed --nodes 10), churn-10/churn-20/churn-20-mixed (subsumed by parameterized churn-mixed), cost-mixed-7node (overlaps mixed-technology) - Add churn-mixed scenario with --nodes flag for scale testing - Reduce idle scenario durations: smoke-10 60s→30s, ethernet-only 90s→30s, cost-avoidance 120s→45s, depth-vs-cost 120s→45s, bottleneck-parent 120s→60s, mixed-technology 180s→90s CI updates: - ci-local.sh: unified image build, structured chaos suite entries with per-scenario flags, --skip-build for sidecar - ci.yml: shared binary install + image build step, updated scenario matrix, chaos_flags support for parameterized scenarios - Add tcp-mesh and congestion-stress to CI matrix - Static ping test uses active peer convergence detection instead of hardcoded 5s sleep Chaos infrastructure improvements (from discovery-rework branch): - Pre-built Docker image instead of per-service build at scale - --nodes flag in chaos.sh for runtime topology size override
52 lines
1.8 KiB
Bash
52 lines
1.8 KiB
Bash
#!/bin/bash
|
|
# Shared convergence wait helpers for FIPS integration tests.
|
|
#
|
|
# Source this file to get wait_for_links() and wait_for_peers().
|
|
#
|
|
# Usage:
|
|
# source "$(dirname "$0")/../../lib/wait-converge.sh"
|
|
# wait_for_links <container> <min_links> [timeout_secs]
|
|
# wait_for_peers <container> <min_peers> [timeout_secs]
|
|
|
|
# Wait until a container has at least min_links active links.
|
|
# Returns 0 on success, 1 on timeout.
|
|
wait_for_links() {
|
|
local container="$1"
|
|
local min_links="$2"
|
|
local timeout="${3:-30}"
|
|
|
|
for i in $(seq 1 "$timeout"); do
|
|
local count
|
|
count=$(docker exec "$container" fipsctl show links 2>/dev/null \
|
|
| python3 -c "import sys,json; print(len(json.load(sys.stdin).get('links',[])))" 2>/dev/null || echo 0)
|
|
if [ "$count" -ge "$min_links" ]; then
|
|
echo " $container: $count link(s) after ${i}s"
|
|
return 0
|
|
fi
|
|
sleep 1
|
|
done
|
|
echo " $container: TIMEOUT waiting for $min_links link(s) after ${timeout}s"
|
|
return 1
|
|
}
|
|
|
|
# Wait until a container has at least min_peers connected peers.
|
|
# Returns 0 on success, 1 on timeout.
|
|
wait_for_peers() {
|
|
local container="$1"
|
|
local min_peers="$2"
|
|
local timeout="${3:-30}"
|
|
|
|
for i in $(seq 1 "$timeout"); do
|
|
local count
|
|
count=$(docker exec "$container" fipsctl show peers 2>/dev/null \
|
|
| python3 -c "import sys,json; print(sum(1 for p in json.load(sys.stdin).get('peers',[]) if p.get('connectivity')=='connected'))" 2>/dev/null || echo 0)
|
|
if [ "$count" -ge "$min_peers" ]; then
|
|
echo " $container: $count peer(s) after ${i}s"
|
|
return 0
|
|
fi
|
|
sleep 1
|
|
done
|
|
echo " $container: TIMEOUT waiting for $min_peers peer(s) after ${timeout}s"
|
|
return 1
|
|
}
|