76 lines
4.9 KiB
Markdown
76 lines
4.9 KiB
Markdown
# JOURNAL — sub-phase rcust (Builder)
|
|
|
|
## 2026-06-10 bootstrap
|
|
|
|
Read phase plan (recipe-custom-restructure-full-plan.md), plan.md §6.1/§7/§9, and the reference
|
|
spec docs/recipe-customization.md @ 76a4b6b in full. Created phase state files. Work branch will
|
|
be `restructure/recipe-custom` off main @ 76a4b6b. Starting P1: reading the six current loaders
|
|
(run_recipe_ci.py::_load_meta, conftest.py::_recipe_meta, lifecycle.py::_recipe_extra_env,
|
|
lifecycle.py::_recipe_meta_flag, deps.py::declared_deps, canonical.py::is_canonical_enrolled)
|
|
before writing harness/meta.py.
|
|
|
|
## 2026-06-10 P1 — single loader + registry (branch 472a68b)
|
|
|
|
Wrote runner/harness/meta.py: KEYS registry (14 keys + CHAOS_BASE_DEPLOY/OIDC_AT_INSTALL/
|
|
SKIP_GENERIC kept registered as deprecated=True so P1 lands green before P2 deletes them),
|
|
RecipeMeta generated from KEYS via dataclasses.make_dataclass (frozen; field set cannot drift from
|
|
the registry), load() = the only exec() of recipe_meta.py, MetaError on unknown ALL-CAPS/type
|
|
mismatch/callable-on-data-key, difflib suggestion in the unknown-key message. BACKUP_CAPABLE keeps
|
|
its tri-state via default None (None = auto-detect — preserves the old `"BACKUP_CAPABLE" in meta`
|
|
semantics in generic.backup_capable).
|
|
|
|
Migrations: orchestrator loads once + passes meta down (deploy_app/perform_upgrade/_perform_op/
|
|
run_lifecycle_tier all take the object); conftest meta fixture returns full RecipeMeta (R3 closed);
|
|
lifecycle._recipe_extra_env/_recipe_meta_flag and deps.declared_deps deleted; canonical.is_enrolled
|
|
+ enrolled_recipes go through meta.load (tests monkeypatch meta.TESTS_DIR now instead of
|
|
canonical.__file__); screenshot._load_screenshot_hook reads the attribute (R2 fixed — unit test
|
|
proves SCREENSHOT survives the real orchestrator load path). deploy_app keeps an optional
|
|
meta=None fallback (loads via the single loader) for fixture/manual callers — exec still happens
|
|
in exactly one function.
|
|
|
|
Effective-value safety check before committing: dumped non_default() for all 21 recipe dirs through
|
|
the new loader — every recipe's customized key set matches its recipe_meta.py source (e.g. mumble:
|
|
DEPLOY_TIMEOUT/EXTRA_ENV/HEALTH_OK/READY_PROBE/UPGRADE_EXTRA_ENV). One intentional delta class:
|
|
deps.deploy_deps' fallback timeouts for a MISSING dep meta change from literal 900/600 to loading
|
|
the dep's real meta (orchestrator path always supplied metas, so CI behavior is identical).
|
|
|
|
Verified on cc-ci (rsynced working tree before committing):
|
|
cc-ci-run -m pytest tests/unit -q -> 175 passed
|
|
nix develop .#lint --command scripts/lint.sh -> lint: PASS
|
|
Three pre-existing f212 unit tests passed dicts to wait_ready_probes — updated mechanically to
|
|
construct RecipeMeta via dataclasses.replace (assertions untouched).
|
|
|
|
Next: P2a compose.ccci.yml first-class + auto-chaos.
|
|
|
|
## 2026-06-10 P2 — legacy keys & paths deleted (branch 8cd72fd)
|
|
|
|
P2a: lifecycle.provide_ccci_overlay copies tests/<recipe>/compose.ccci.yml into the per-run
|
|
checkout (after install_steps hook, before prepull/deploy); pinned base deploys auto-chaos on
|
|
overlay presence (has_ccci_overlay replaces the meta.CHAOS_BASE_DEPLOY elif). ghost/discourse
|
|
install_steps.sh were copy-only -> deleted whole; their metas keep COMPOSE_FILE in EXTRA_ENV
|
|
(unchanged wiring, the harness now owns the copy).
|
|
|
|
P2b: oidc_at_install condition removed — `if declared:` provisions before the single deploy,
|
|
legacy post-deploy block + _run_setup_custom_tests_hook deleted. lasuite-docs install_steps.sh is
|
|
the meet/drive hook with docs' exact env names (diffed against the deleted setup_custom_tests.sh:
|
|
same keys incl. OIDC_OP_DISCOVERY_ENDPOINT + scopes 'openid email profile'; secret-insert bump
|
|
identical; only the abra-redeploy step is gone — the single deploy reads the env instead).
|
|
lasuite-drive's MinIO bucket one-shot -> ops.py pre_install (runs at install-tier start, post-
|
|
deploy; bucket lives in the minio volume so it survives upgrade/restore; same scale --detach +
|
|
30x3s poll as the shell version). run_quick: deps still provision (realm/creds), hook call gone —
|
|
no quick-enrolled recipe declares DEPS today; noted inline.
|
|
|
|
P2c: SKIP_GENERIC out of the registry; _skip_generic(op) env-only; skip_generic_env_overrides()
|
|
prints a `!!` warning when active under DRONE (P5 will embed in the manifest).
|
|
|
|
P2d: conftest deps fixture = dict of _DepEntry (dict subclass w/ attribute sugar) — the 6 lasuite
|
|
files only ever used deps_creds, renamed param to deps, zero assertion changes. NOTE for Adversary:
|
|
some assert MESSAGE strings ('setup_custom_tests should have populated this.' -> 'dep
|
|
provisioning...') and docstrings updated — message text only, no assert logic/expected values.
|
|
|
|
Verified on cc-ci (rsync of working tree): cc-ci-run -m pytest tests/unit -q -> 175 passed;
|
|
nix develop .#lint --command scripts/lint.sh -> PASS. Doc table regenerated to the 14-key registry
|
|
(doc-sync unit test pins it).
|
|
|
|
Next: P3 — HookCtx + ctx-hook signatures everywhere.
|