mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-08 03:38:23 +00:00
kevinveenbirkenbachandClaude Opus 4.7
19f9735909
The URL-reachability probe now bounds its wall-clock end-to-end: allow_redirects=False (a redirect chain previously stacked timeouts), a 5h30m global deadline that marks in-flight probes as warnings on expiry, and live `[done/total]` progress every 50 probes. Submission order is shuffled so same-host URLs no longer batch at the front and self-DoS one origin. The Docker image-version test drops its bespoke sequential fetch loop and calls find_outdated_updates() from utils.update.docker, so it now shares the INFINITO_WORKER_FETCH-sized worker pool with the repository-refs check. `scripts/tests/code/wrapper.sh` propagates BASH_ENV into the container exec — without it INFINITO_WORKER_FETCH was unset inside the container and the URL probe collapsed to 1 worker. `make test` gains test-external; `make dotenv-force` regenerates .env with a stripped environment so stale BASH_ENV-preloaded INFINITO_* values cannot pin old numbers via setdefault. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
76 lines
3.3 KiB
Bash
Executable File
76 lines
3.3 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Chooses where to execute scripts/tests/code/run.sh based on
|
|
# INFINITO_TEST_RUNNER:
|
|
# docker (default) -- inside the already-running infinito compose
|
|
# container (requires `make up`).
|
|
# host -- directly against the host shell/Python.
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
REPO_ROOT="$(cd "${SCRIPT_DIR}/../../.." && pwd)"
|
|
RUN_SCRIPT="${SCRIPT_DIR}/run.sh"
|
|
|
|
# Pull project-wide defaults (INFINITO_SRC_DIR, INFINITO_TEST_PATTERN, ...)
|
|
# from the generated `.env` (single source of truth) before validating
|
|
# anything else, so the :?-checks below see the static defaults.
|
|
cd "${REPO_ROOT}"
|
|
# shellcheck source=scripts/meta/env/load.sh
|
|
source scripts/meta/env/load.sh
|
|
|
|
: "${INFINITO_TEST_PATTERN:?INFINITO_TEST_PATTERN must be set}"
|
|
: "${INFINITO_TEST_RUNNER:?INFINITO_TEST_RUNNER must be set}"
|
|
: "${INFINITO_TEST_TYPE:?INFINITO_TEST_TYPE must be set}"
|
|
|
|
RUN_SCRIPT_IN_CONTAINER="${INFINITO_SRC_DIR}/scripts/tests/code/run.sh"
|
|
|
|
case "${INFINITO_TEST_RUNNER}" in
|
|
docker)
|
|
# INFINITO_DISTRO is sourced (with a `debian` default) from
|
|
# scripts/meta/env/load.sh above, so no explicit check here.
|
|
echo "============================================================"
|
|
echo ">>> Running ${INFINITO_TEST_TYPE^^} tests in ${INFINITO_DISTRO} container (compose stack)"
|
|
echo "============================================================"
|
|
|
|
# Auto-bring-up: if the `infinito` container is not running, kick off
|
|
# `make up` first so test-* doesn't fail with "service not running".
|
|
if ! docker compose --env-file env/ci.env --env-file .env --profile ci \
|
|
ps -q infinito 2>/dev/null | grep -q .; then
|
|
echo ">>> 'infinito' container not running; starting the stack via 'make up'..."
|
|
"${MAKE:-make}" up
|
|
fi
|
|
|
|
# `--env-file env/ci.env --env-file .env` pulls the network defaults
|
|
# (INFINITO_DNS_IP, INFINITO_IP4, INFINITO_DOMAIN, ...) from ci.env
|
|
# and the generated keys (INFINITO_CONTAINER, INFINITO_SUBNET, ...)
|
|
# from `.env`. Compose otherwise auto-loads only `.env`, which would
|
|
# leave the ci.env keys unset when this wrapper is the entry point.
|
|
# BASH_ENV makes `bash --login` source load.sh on startup, pulling
|
|
# every INFINITO_* key from the bind-mounted .env into the test
|
|
# runner's environment (notably INFINITO_WORKER_FETCH, otherwise the
|
|
# external URL probe collapses to 1 worker).
|
|
INFINITO_DISTRO="${INFINITO_DISTRO}" \
|
|
docker compose --env-file env/ci.env --env-file .env --profile ci exec -T \
|
|
-e ACT="${ACT:-}" \
|
|
-e BASH_ENV="${INFINITO_SRC_DIR}/scripts/meta/env/load.sh" \
|
|
-e GITHUB_ACTIONS="${GITHUB_ACTIONS:-}" \
|
|
-e GITHUB_REPOSITORY="${GITHUB_REPOSITORY:-}" \
|
|
-e GITHUB_REPOSITORY_OWNER="${GITHUB_REPOSITORY_OWNER:-}" \
|
|
-e GITHUB_SHA="${GITHUB_SHA:-}" \
|
|
-e INFINITO_TEST_PATTERN="${INFINITO_TEST_PATTERN}" \
|
|
-e INFINITO_TEST_TYPE="${INFINITO_TEST_TYPE}" \
|
|
--workdir "${INFINITO_SRC_DIR}" \
|
|
infinito \
|
|
bash --login "${RUN_SCRIPT_IN_CONTAINER}"
|
|
;;
|
|
host)
|
|
echo "============================================================"
|
|
echo ">>> Running ${INFINITO_TEST_TYPE^^} tests on host"
|
|
echo "============================================================"
|
|
exec bash --login "${RUN_SCRIPT}"
|
|
;;
|
|
*)
|
|
echo "scripts/tests/code/wrapper.sh: unknown INFINITO_TEST_RUNNER='${INFINITO_TEST_RUNNER}' (expected: docker|host)" >&2 # nocheck: self-path-reference
|
|
exit 2
|
|
;;
|
|
esac
|