diff --git a/JOURNAL-rcust.md b/JOURNAL-rcust.md index 45fae1d..0bc64a5 100644 --- a/JOURNAL-rcust.md +++ b/JOURNAL-rcust.md @@ -41,3 +41,35 @@ Three pre-existing f212 unit tests passed dicts to wait_ready_probes — updated 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//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. diff --git a/STATUS-rcust.md b/STATUS-rcust.md index 0ff9f41..6c83278 100644 --- a/STATUS-rcust.md +++ b/STATUS-rcust.md @@ -8,15 +8,18 @@ Work branch: `restructure/recipe-custom` (one commit per phase P1–P6; merged t - [x] P1 — single loader + key registry + migrate L1–L6 + unit tests + doc gen (branch commit 472a68b) -- [ ] P2 — delete legacy keys/paths (CHAOS_BASE_DEPLOY, OIDC_AT_INSTALL, SKIP_GENERIC meta, conftest cleanup) +- [x] P2 — delete legacy keys/paths: compose.ccci.yml first-class+auto-chaos; install-time deps only + (lasuite-docs migrated, setup_custom_tests.sh gone); SKIP_GENERIC meta deleted (env dev-only + + loud CI warning); conftest cleanup (deployed/deployed_app/app_domain gone, one `deps` fixture) + (branch commit 8cd72fd) - [ ] P3 — uniform ctx hook convention - [ ] P4 — custom-test ergonomics (placement rule, op_state/deps fixtures) - [ ] P5 — customization manifest - [ ] P6 — docs -## P1 verification facts (for the eventual M1 cold-verify) +## P1+P2 verification facts (for the eventual M1 cold-verify) -- WHERE: branch `restructure/recipe-custom`, commit 472a68b. +- WHERE: branch `restructure/recipe-custom`, P1=472a68b, P2=8cd72fd. - HOW: `cc-ci-run -m pytest tests/unit -q` and `nix develop .#lint --command scripts/lint.sh` from a clean checkout of the branch. - EXPECTED: 175 passed; `lint: PASS`. @@ -30,4 +33,4 @@ Work branch: `restructure/recipe-custom` (one commit per phase P1–P6; merged t ## Current -P1 done; starting P2 (legacy key/path deletion). +P1+P2 done on the branch; starting P3 (uniform ctx hook convention).