mirror of
https://github.com/jmcorgan/fips.git
synced 2026-07-30 19:46:15 +00:00
Suffix the mixed-profile test's container names where it builds them
Giving the mixed-profile services a run-scoped container_name broke this script's two ping sites, which assemble the name as "fips-$from" rather than writing it out. A grep for the literal name finds neither, which is the same trap the earlier naming sweep hit on the other static scripts. The failure was loud — link convergence passed 3/2/2/1 and then every ping failed, because docker exec could not find the container — but it is worth noting that these names were unsuffixed until now, so this suite was never safe to run twice on one host.
This commit is contained in:
@@ -90,7 +90,7 @@ check() {
|
||||
ping_fips() {
|
||||
local from="$1"
|
||||
local to_npub="$2"
|
||||
docker exec "fips-$from" ping6 -c 1 -W 5 "${to_npub}.fips"
|
||||
docker exec "fips-${from}${FIPS_CI_NAME_SUFFIX:-}" ping6 -c 1 -W 5 "${to_npub}.fips"
|
||||
}
|
||||
|
||||
echo "=== Mixed-Profile Integration Test ==="
|
||||
@@ -126,7 +126,7 @@ while (( SECONDS - CONV_START < CONV_TIMEOUT )); do
|
||||
"node-d:$NPUB_A" "node-d:$NPUB_B"; do
|
||||
from="${pair%%:*}"
|
||||
to="${pair##*:}"
|
||||
if ! docker exec "fips-$from" ping6 -c 1 -W 1 "${to}.fips" >/dev/null 2>&1; then
|
||||
if ! docker exec "fips-${from}${FIPS_CI_NAME_SUFFIX:-}" ping6 -c 1 -W 1 "${to}.fips" >/dev/null 2>&1; then
|
||||
ALL_GOOD=false
|
||||
break
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user