Compare commits

...

6 Commits

3 changed files with 41 additions and 8 deletions
+23 -6
View File
@@ -1,22 +1,39 @@
# Task 06G4GWWJ8SWFREF06HDYEBAG0C
# Task 06G4SWEVP71FYYKAV5FV0ZK5ZG
Route the healthcheck output through one helper
Give the healthcheck a --summary flag
- Project: test-e2e
- Source: gitea:test-e2e/15
- Source: burnin/run16-rotation
- Priority: 0
## Instructions
`scripts/orchestra_e2e_healthcheck.sh` prints its success line from more than one place. Centralise the output so every path goes through one helper, and give that helper an explicit format argument rather than reading a global.
Give scripts/orchestra_e2e_healthcheck.sh a --summary flag that prints one line per check with its result, then the usual success line.
Behaviour must not change. The plain run, `--quiet`, `--help` and `--json` all keep their current output and exit statuses, and `scripts/test_healthcheck.sh` keeps passing.
Plan this as three phases, because each piece is independently verifiable:
1. Introduce a results list. Record each check's name and outcome as it runs, with no change to any existing output or exit status.
2. Add the --summary flag. It prints one line per recorded result, then the existing success line.
3. Update the usage text and scripts/test_healthcheck.sh so the expected --help output matches.
## Verification policy for this project
Only two commands may appear on a run: line, exactly:
- ["bash", "-n", "<path>"]
- ["bash", "scripts/orchestra_e2e_healthcheck.sh"]
Anything else is refused when you seal the plan. Give every phase at least one automated check from that list, and add a manual check where a human should confirm the printed text.
## Research first
Establish at least three findings with distinct confidence: at least one `fact`, one `inference`, one `assumption`.
Establish at least three findings with distinct confidence: at least one fact, one inference, one assumption.
## Quality gate
bash -n scripts/*.sh && bash scripts/orchestra_e2e_healthcheck.sh
## Completion
Run the configured quality gate. When the task is ready for the worker to verify and deliver, create `.orchestra/done`. Do not write a prose completion report.
+17 -1
View File
@@ -1,5 +1,7 @@
#!/usr/bin/env bash
readonly VERSION=1.0.0
# emit <format> <template> [args...]: the single output path.
# format: text or json print; none suppresses (--quiet). Explicit argument,
# never read from an enclosing variable.
@@ -12,20 +14,28 @@ emit() {
main() {
local quiet=
local json=
local summary=
local -a results=()
for arg in "$@"; do
if [ "$arg" = --help ]; then
emit text 'Usage: %s [--quiet]\n\n' "${0##*/}"
emit text 'Usage: %s [--quiet] [--summary]\n\n' "${0##*/}"
emit text 'Healthcheck script for Orchestra E2E tests.\n'
emit text 'Exits 0 with a success message if all checks pass.\n'
emit text ' --quiet Suppress the success message; still exits 0.\n'
emit text ' --summary Print one line per check before the success message.\n'
emit text 'Version: %s\n' "$VERSION"
exit 0
elif [ "$arg" = --quiet ]; then
quiet=1
elif [ "$arg" = --json ]; then
json=1
elif [ "$arg" = --summary ]; then
summary=1
fi
done
results+=("healthcheck ok")
local format=text
[ -n "$quiet" ] && format=none
[ -n "$json" ] && format=json
@@ -35,6 +45,12 @@ main() {
exit 0
fi
if [ -n "$summary" ]; then
for r in "${results[@]}"; do
emit "$format" '%s: %s\n' "${r%% *}" "${r#* }"
done
fi
emit "$format" 'OK - all healthchecks passed\n'
exit 0
}
+1 -1
View File
@@ -3,7 +3,7 @@
HC="$(dirname "$0")/orchestra_e2e_healthcheck.sh"
OK='OK - all healthchecks passed'
USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet]\n\nHealthcheck script for Orchestra E2E tests.\nExits 0 with a success message if all checks pass.\n --quiet Suppress the success message; still exits 0.')"
USAGE="$(printf 'Usage: orchestra_e2e_healthcheck.sh [--quiet] [--summary]\n\nHealthcheck script for Orchestra E2E tests.\nExits 0 with a success message if all checks pass.\n --quiet Suppress the success message; still exits 0.\n --summary Print one line per check before the success message.\nVersion: 1.0.0')"
fails=0
check() { # check <expected-stdout> <label> [args...]