mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 02:54:26 +00:00
`3c1d5d821` solved the cross-round backbone-abriss problem by making `include` equal the union of every variant's closure for every round. Side-effect: every matrix round then ALSO deployed the full union, so `08_deploy_performance.sh` saw `dashboard.infinito.example` still answering HTTP 200 after a matomo-only `deploy-fresh-purged-apps` — the deploy step was no longer matomo-only at all. Split the two concerns instead: - `include` (PlanEntry[3]) goes back to the per-round variant-closure. Both `init`/`builder` (`--include` for the inventory bake) and `deploy` (`--id` for ansible) consume it. Each round therefore deploys ONLY its own variant-closure again — the pre-`3c1d5d821` semantics. - `purge_set` (PlanEntry[4], new) carries the union across all rounds. `deploy.py` uses it for the inter-round wipe instead of the previous round's include. Result: between rounds the WHOLE matrix footprint is purged, not just the previous round's variant slice — a variant pinning `services.<X>.shared: false` cannot leave its bundled provider on the host for a sibling round that wires the same service shared. The backbone-abriss `3c1d5d821` was hunting stays fixed: whichever round needs the backbone re-deploys it immediately after the wipe (purge runs at the start of each round, not the end). `previous_round_include` tracking is gone. The first iteration skips the purge (nothing to wipe yet), which also covers `total_rounds == 1` and `--variant N` pinned single-folder modes cleanly. Unrelated, but staged together because it is part of the same investigation: - `roles/dev-nix/templates/nix.conf.j2`: enable `keep-derivations` / `keep-outputs`, so `nix-collect-garbage -d` (run by the aggressive prune step) does not drop the build closure of pkgmgr's flake; this was making every deploy re-fetch the build inputs from cache.nixos.org and overshoot pkgmgr's update timeout. - `roles/pkgmgr/tasks/01_core.yml`: raise the pkgmgr update timeout from 600s to 1800s and lower the retry count from 6 to 3, so a slow fetch on a single try no longer pushes total wallclock past three hours. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
139 lines
4.3 KiB
Python
139 lines
4.3 KiB
Python
"""Inventory folder materialisation.
|
|
|
|
`build_dev_inventory` is the SPOT that turns a `DevInventorySpec` into a
|
|
fully baked inventory folder via the `infinito administration inventory
|
|
provision` CLI. `build_dev_inventory_matrix` is the orchestrator: it
|
|
runs the planner and builds every round's folder.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from typing import TYPE_CHECKING, Any
|
|
|
|
from cli.administration.deploy.development.common import DEV_INVENTORY_VARS_FILE
|
|
from cli.administration.deploy.development.mirrors import (
|
|
generate_ci_mirrors_file,
|
|
should_use_mirrors_on_ci,
|
|
)
|
|
|
|
from .payload import _bake_overrides, _resolve_variant_payloads
|
|
from .planner import plan_dev_inventory_matrix
|
|
from .spec import DevInventorySpec, PlanEntry
|
|
|
|
if TYPE_CHECKING:
|
|
from collections.abc import Mapping, Sequence
|
|
|
|
from cli.administration.deploy.development.compose import Compose
|
|
|
|
|
|
def build_dev_inventory(compose: Compose, spec: DevInventorySpec) -> None:
|
|
"""Build the inventory folder described by `spec` and ensure its
|
|
vault password file exists. Two side-effects, no return value: after
|
|
this call, `spec.inventory_dir` contains a complete, variant-resolved
|
|
inventory.
|
|
"""
|
|
inv_root = spec.inventory_root()
|
|
|
|
variant_payloads = _resolve_variant_payloads(
|
|
roles_dir=str(compose.repo_root / "roles"),
|
|
include=spec.include,
|
|
active_variants=spec.variant_selectors(),
|
|
)
|
|
vars_payload = _bake_overrides(
|
|
base_overrides=spec.overrides(),
|
|
variant_payloads=variant_payloads,
|
|
)
|
|
|
|
cmd = [
|
|
"infinito",
|
|
"administration",
|
|
"inventory",
|
|
"provision",
|
|
inv_root,
|
|
"--host",
|
|
"localhost",
|
|
"--ssl-disabled",
|
|
"--vars-file",
|
|
DEV_INVENTORY_VARS_FILE,
|
|
"--vars",
|
|
json.dumps(vars_payload, sort_keys=True),
|
|
"--include",
|
|
",".join(spec.include),
|
|
]
|
|
|
|
if should_use_mirrors_on_ci():
|
|
mirrors_file = generate_ci_mirrors_file(compose, inventory_dir=inv_root)
|
|
cmd += ["--mirror", mirrors_file]
|
|
|
|
extra_env: dict[str, str] = {}
|
|
if spec.services_disabled:
|
|
extra_env["SERVICES_DISABLED"] = spec.services_disabled
|
|
|
|
compose.exec(
|
|
cmd,
|
|
check=True,
|
|
workdir="/opt/src/infinito",
|
|
extra_env=extra_env or None,
|
|
)
|
|
_ensure_vault_password_file(compose, inventory_dir=inv_root)
|
|
|
|
|
|
def build_dev_inventory_matrix(
|
|
compose: Compose,
|
|
*,
|
|
base_inventory_dir: str,
|
|
primary_apps: Sequence[str],
|
|
storage_constrained: bool,
|
|
runtime: str,
|
|
extra_vars: Mapping[str, Any] | None = None,
|
|
services_disabled: str = "",
|
|
include_filter: Sequence[str] | None = None,
|
|
) -> list[PlanEntry]:
|
|
"""Build every folder in the matrix plan and return the plan.
|
|
|
|
`include_filter`, when provided, is the set of role names a caller
|
|
has already filtered (e.g. by SERVICES_DISABLED removal of provider
|
|
roles). Each round's include is intersected with this set before
|
|
being baked, so the inventory and `--include` flag stay aligned
|
|
with whatever the deploy step will actually deploy.
|
|
"""
|
|
plan = plan_dev_inventory_matrix(
|
|
roles_dir=str(compose.repo_root / "roles"),
|
|
primary_apps=primary_apps,
|
|
base_inventory_dir=base_inventory_dir,
|
|
)
|
|
allow: set[str] | None = set(include_filter) if include_filter is not None else None
|
|
for _round_index, inv_dir, round_variants, raw_include, _purge_set in plan:
|
|
round_include = (
|
|
tuple(role for role in raw_include if role in allow)
|
|
if allow is not None
|
|
else raw_include
|
|
)
|
|
spec = DevInventorySpec(
|
|
inventory_dir=inv_dir,
|
|
include=round_include,
|
|
storage_constrained=storage_constrained,
|
|
runtime=runtime,
|
|
extra_vars=extra_vars,
|
|
services_disabled=services_disabled,
|
|
active_variants=round_variants,
|
|
)
|
|
build_dev_inventory(compose, spec)
|
|
return plan
|
|
|
|
|
|
def _ensure_vault_password_file(compose: Compose, *, inventory_dir: str) -> None:
|
|
inv_root = str(inventory_dir).rstrip("/")
|
|
pw_file = f"{inv_root}/.password"
|
|
compose.exec(
|
|
[
|
|
"sh",
|
|
"-lc",
|
|
f"mkdir -p {inv_root} && "
|
|
f"[ -f {pw_file} ] || "
|
|
f"printf '%s\n' 'ci-vault-password' > {pw_file}",
|
|
],
|
|
check=True,
|
|
)
|