Revert "Fix lint issues and improve test suite resilience"
This reverts commit 90d44bd3bc.
This commit is contained in:
@@ -15,7 +15,7 @@ fi
|
||||
|
||||
# Validate a compose file against the Docker Compose specification
|
||||
test_compose_config() {
|
||||
local file=$1 main=${2:-}
|
||||
local file=$1
|
||||
|
||||
# Skip if Docker Compose is not available on this system
|
||||
if [ -z "$compose_cmd" ]; then
|
||||
@@ -23,27 +23,13 @@ test_compose_config() {
|
||||
return
|
||||
fi
|
||||
|
||||
# Main compose file is validated standalone
|
||||
if [ -z "$main" ]; then
|
||||
if $compose_cmd -f "$file" config -q 2>/dev/null; then
|
||||
echo " PASS $file"
|
||||
pass=$((pass + 1))
|
||||
else
|
||||
echo " FAIL $file"
|
||||
fail=$((fail + 1))
|
||||
fi
|
||||
return
|
||||
fi
|
||||
|
||||
# Override files are validated combined with the main compose file.
|
||||
# If the combination still fails, the override needs additional context
|
||||
# (e.g. other override files) and is skipped rather than failed.
|
||||
if $compose_cmd -f "$main" -f "$file" config -q 2>/dev/null; then
|
||||
# config -q exits with non-zero if the compose file is invalid
|
||||
if $compose_cmd -f "$file" config -q 2>/dev/null; then
|
||||
echo " PASS $file"
|
||||
pass=$((pass + 1))
|
||||
else
|
||||
echo " SKIP $file (partial override, needs additional context)"
|
||||
pass=$((pass + 1))
|
||||
echo " FAIL $file"
|
||||
fail=$((fail + 1))
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -55,7 +41,7 @@ test_compose_config "$ROOT/compose.yml"
|
||||
while IFS= read -r f; do
|
||||
# Skip the main compose file (already tested above)
|
||||
[ "$f" = "$ROOT/compose.yml" ] && continue
|
||||
[ -f "$f" ] && test_compose_config "$f" "$ROOT/compose.yml"
|
||||
[ -f "$f" ] && test_compose_config "$f"
|
||||
done < <(find "$ROOT" -maxdepth 1 -name 'compose*.yml' | sort)
|
||||
|
||||
echo "---"
|
||||
|
||||
Reference in New Issue
Block a user