Files
computer-playbook/scripts/tests/deploy/ci/dedicated.sh
T
kevinveenbirkenbachandClaude Opus 4.7 8e293bd921 fix(compose-deploy): stop persisting runtime routing knobs into .env
Root cause of step-08 deploy failures across all 4 test-development
distros in run 26572559126: `make compose-deploy mode=reinstall
apps=web-app-dashboard INFINITO_SERVICES_DISABLED=matomo` (step 07)
made make export the cmdline var into the recipe's shell env, which
reached `runner.py` → `make setup` → `make dotenv`. The dotenv
generator's `setdefault` then baked the runtime-only value into the
on-disk `.env`. Step 08 sourced that .env, filtered `web-app-matomo`
out of its primary apps, and exited with "All primary apps disabled".

Fix:

- Drop the 7 routing knobs (apps, mode, purge, bundles, disable,
  full_cycle, variant) from `passthrough.STATIC_KEYS` and from
  `default.env`. They are per-invocation; .env is the persistent SPOT
  and must not capture them.
- Switch every consumer from `os.environ["KEY"]` strict access to
  `os.environ.get("KEY", "")` so the missing-key path stops at "no
  filter" instead of a KeyError.
- Rename the env-var surface to match the make-alias surface 1:1
  (lowercase): INFINITO_APPS → apps, INFINITO_SERVICES_DISABLED →
  disable, INFINITO_BUNDLES → bundles, INFINITO_FULL_CYCLE →
  full_cycle, INFINITO_VARIANT → variant, INFINITO_DEPLOY_MODE → mode,
  INFINITO_PURGE_ENTITIES → purge. The make alias was the user-facing
  name in every doc; routing-knob env vars now use the same name so
  the cmdline form, the recipe env-prefix, and the consumer reads
  all line up.
- Collapse the Makefile `compose-deploy` recipe to just the two
  knobs whose alias differs from the env name (`type` →
  INFINITO_DEPLOY_TYPE, `debug` → INFINITO_DEBUG). GNU Make
  auto-exports cmdline variables into the recipe's shell env, so the
  identical-name `$(if $(apps),apps="$(apps)")` lines were pure
  noise.
- Drop `disable: ${disable}` from compose.yml. The dev CLI builds
  `extra_env` per `docker exec` call and forwards `disable` via
  `-e`, so the container env never needs the value frozen at
  compose-up time.
- Update the 3 actual leak call sites
  (07/08/09_deploy_*.sh) to the make-alias form
  (`disable=matomo`, `full_cycle=true`, `variant=1`).
- Add `SIM112` to ruff's ignore set: the lowercase env names are
  the deliberate make/env parity, not a typo.

Repro before fix: `INFINITO_SERVICES_DISABLED=matomo make dotenv`
wrote `INFINITO_SERVICES_DISABLED=matomo` to `.env`. After fix:
`disable=matomo make dotenv` leaves `.env` untouched.

Tests: `make test` and `make autoformat` green (2711 tests, 8 lint
sub-targets).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
2026-05-28 17:47:03 +02:00

187 lines
6.4 KiB
Bash
Executable File

#!/usr/bin/env bash
set -euo pipefail
# Deploy exactly ONE app on ONE distro against the same stack, with the
# matrix-aware sync + async passes co-located per variant.
#
# Flow:
# 1) Ensure compose stack is up (reuse if already running)
# 2) Init inventory once (ASYNC_ENABLED=false baked into host_vars).
# For roles with `meta/variants.yml` this materialises one folder
# per variant; otherwise a single unsuffixed folder.
# 3) Deploy with `--full-cycle`: per matrix round the dev wrapper runs
# the sync deploy, then immediately the async re-deploy with
# `-e ASYNC_ENABLED=true`, BEFORE moving to the next variant.
# Inter-round cleanup runs only for apps whose variant changed.
# 4) Always remove stack so the next distro starts fresh.
#
# Required env:
# INFINITO_DISTRO="arch|debian|ubuntu|fedora|centos"
# INFINITO_INVENTORY_DIR="/path/to/inventory"
#
# Optional env:
# PYTHON="python3"
# variant="<idx>" pin to one matrix round (skips the rest)
PYTHON="${PYTHON:-python3}"
: "${INFINITO_DISTRO:?INFINITO_DISTRO must be set (e.g. arch)}"
: "${INFINITO_INVENTORY_DIR:?INFINITO_INVENTORY_DIR must be set}"
: "${INFINITO_DOCKER_VOLUME:?INFINITO_DOCKER_VOLUME must be set}"
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
REPO_ROOT="$(cd "${SCRIPT_DIR}/../../../.." && pwd)"
apps=""
usage() {
cat <<'EOF'
Usage:
INFINITO_DISTRO=<distro> INFINITO_INVENTORY_DIR=<dir> INFINITO_DOCKER_VOLUME=<abs_path> \
scripts/tests/deploy/ci/dedicated.sh \ # nocheck: self-path-reference
--apps <app_ids>
EOF
}
while [[ $# -gt 0 ]]; do
case "$1" in
--apps)
apps="${2:-}"
shift 2
;;
-h | --help)
usage
exit 0
;;
*)
echo "[ERROR] Unknown argument: $1" >&2
usage
exit 2
;;
esac
done
[[ -n "${apps}" ]] || {
echo "[ERROR] --apps is required" >&2
usage
exit 2
}
cd "${REPO_ROOT}"
echo "=== distro=${INFINITO_DISTRO} app=${apps} (debug always on) ==="
cleanup() {
rc=$?
# Copy Playwright reports from the infinito container to the runner filesystem
# BEFORE containers/volumes are destroyed, so GitHub Actions can upload them as artifacts.
local _playwright_host_dir="/tmp/playwright-artifacts/${INFINITO_DISTRO}/${apps}"
mkdir -p "${_playwright_host_dir}"
echo ">>> Copying Playwright artifacts from ${INFINITO_CONTAINER} to ${_playwright_host_dir}"
docker cp "${INFINITO_CONTAINER}:/var/lib/infinito/logs/test-e2e-playwright/." \
"${_playwright_host_dir}" 2>/dev/null || true
if [[ -n "${ANSIBLE_LOG_PATH:-}" ]]; then
echo ">>> Copying Ansible log from ${INFINITO_CONTAINER}:${ANSIBLE_LOG_PATH} to ${ANSIBLE_LOG_PATH}"
docker cp "${INFINITO_CONTAINER}:${ANSIBLE_LOG_PATH}" "${ANSIBLE_LOG_PATH}" 2>/dev/null || true
fi
echo ">>> Removing stack for distro ${INFINITO_DISTRO} (fresh start for next distro)"
"${PYTHON}" -m cli.administration.deploy.development down || true
echo ">>> HARD cleanup (containers/volumes/networks/images/build-cache)"
echo ">>> Docker disk usage before HARD cleanup"
docker system df || true
# 1) Remove ALL containers (including running ones)
mapfile -t ids < <(docker ps -aq || true)
if ((${#ids[@]} > 0)); then
docker rm -f "${ids[@]}" >/dev/null 2>&1 || true
fi
# 2) Remove networks (except default ones)
docker network prune -f >/dev/null 2>&1 || true
# 3) Remove ALL volumes
docker volume prune -f >/dev/null 2>&1 || true
# 4) Optional: leftover stopped containers (usually redundant after rm -f)
docker container prune -f >/dev/null 2>&1 || true
# 5) Remove ALL images and build cache.
# Important for serial multi-distro CI runs on the same runner.
docker image prune -af >/dev/null 2>&1 || true
docker buildx prune -af >/dev/null 2>&1 || true
docker builder prune -af >/dev/null 2>&1 || true
# 6) Remove host-mounted Docker data dir (CI runner only)
# IMPORTANT:
# - In CI, Docker/DIND/buildx may create root-owned files under this directory.
# - A plain 'rm -rf' can fail with "Permission denied" and poison the next distro run.
# - Use sudo for a hard reset, then recreate the directory.
if [[ -n "${INFINITO_DOCKER_VOLUME:-}" ]]; then
if [[ "${INFINITO_DOCKER_VOLUME}" == /* ]]; then
echo ">>> CI cleanup: wiping Docker root: ${INFINITO_DOCKER_VOLUME}"
echo ">>> Pre-clean ownership/permissions (best-effort)"
ls -ld "${INFINITO_DOCKER_VOLUME}" || true
sudo ls -ld "${INFINITO_DOCKER_VOLUME}" || true
echo ">>> Removing host docker volume dir: ${INFINITO_DOCKER_VOLUME}"
sudo rm -rf "${INFINITO_DOCKER_VOLUME}" || true
sudo mkdir -vp "${INFINITO_DOCKER_VOLUME}" || true
# Optional: keep it writable for the runner user
sudo chown -R "$(id -u):$(id -g)" "${INFINITO_DOCKER_VOLUME}" || true
echo ">>> Post-clean ownership/permissions (best-effort)"
ls -ld "${INFINITO_DOCKER_VOLUME}" || true
sudo ls -ld "${INFINITO_DOCKER_VOLUME}" || true
else
echo "[WARN] INFINITO_DOCKER_VOLUME is not an absolute path: '${INFINITO_DOCKER_VOLUME}' (skipping)"
fi
fi
echo ">>> Docker disk usage after HARD cleanup"
docker system df || true
echo ">>> HARD cleanup finished"
return $rc
}
trap cleanup EXIT
echo ">>> Ensuring stack is up for distro ${INFINITO_DISTRO}"
# Always reconcile the stack to the requested distro.
# This avoids reusing a pre-started stack with a different INFINITO_DISTRO.
"${PYTHON}" -m cli.administration.deploy.development up
deploy_args=(
--apps "${apps}"
--inventory-dir "${INFINITO_INVENTORY_DIR}"
--debug
)
echo ">>> DISK / DOCKER STATE BEFORE DEPLOY (distro=${INFINITO_DISTRO})"
df -h || true
docker system df || true
echo ">>> END STATE BEFORE DEPLOY"
echo ">>> init inventory (ASYNC_ENABLED=false baked into host_vars)"
"${PYTHON}" -m cli.administration.deploy.development init \
--apps "${apps}" \
--inventory-dir "${INFINITO_INVENTORY_DIR}" \
--vars '{"ASYNC_ENABLED": false}'
# PASS 1 (sync) + PASS 2 (async) co-located per variant: the wrapper
# runs each round's deploy twice, second call with `-e ASYNC_ENABLED=true`
# overriding the host_var, BEFORE moving to the next variant. That keeps
# the async re-deploy targeting exactly the host state the matching sync
# deploy just produced and avoids the matrix-twice race the previous
# split passes had on multi-variant roles.
echo ">>> deploy (PASS 1 sync + PASS 2 async per variant, --full-cycle)"
"${PYTHON}" -m cli.administration.deploy.development deploy "${deploy_args[@]}" --full-cycle
echo ">>> DISK / DOCKER STATE AFTER DEPLOY (before cleanup, distro=${INFINITO_DISTRO})"
df -h || true
docker system df || true
echo ">>> END STATE AFTER DEPLOY"