feat(1e): HC3 additive generic + op/assertion split (orchestrator owns the op)
- orchestrator: per mutating tier, run optional pre-op seed hook (ops.py pre_<op>) → perform the op
ONCE (harness-owned) → run generic assertion (unless opted out) AND overlay assertion, both against
the shared post-op deployment. Op results passed op→assertion via run-scoped CCCI_OP_STATE_FILE.
- opt-out: CCCI_SKIP_GENERIC / CCCI_SKIP_GENERIC_<OP> / recipe_meta.SKIP_GENERIC (declarative).
- generic.py: split do_* into op primitives (perform_upgrade/backup/restore) + assertions
(assert_upgraded/backup_artifact/restore_healthy) reading op_state(); deployed_identity now returns
{version,image,chaos} (chaos label ready for HC1).
- generic test_<op>.py + all 6 recipe overlays migrated to assertion-only; pre-op seeding moved to
per-recipe ops.py (pre_upgrade/pre_backup/pre_restore). install overlays unchanged (no op).
- deploy-count stays 1 (op primitives never call deploy_app). lint PASS; 8 unit tests PASS on cc-ci.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@ -1,25 +1,22 @@
|
||||
"""custom-html — RESTORE overlay (Phase 1d, DG4): data-integrity, extends the generic restore.
|
||||
"""custom-html — RESTORE overlay (Phase 1e HC3): data-integrity, assertion-only + additive.
|
||||
|
||||
Runs after the backup overlay (test_backup.py) on the SAME shared deployment, which left state
|
||||
mutated to "mutated" after backing up "original". This restores the snapshot via the shared op
|
||||
helper (`generic.do_restore`, which also asserts the app is healthy + serving afterwards), then
|
||||
asserts the VOLUME data returned to the pre-mutation "original" — the app-specific data integrity the
|
||||
generic restore cannot check. Reads the marker via exec_in_app (volume-direct, robust to the
|
||||
post-restore serving race). Assertion-only (no deploy/teardown)."""
|
||||
The orchestrator ran `ops.pre_restore` (mutated the marker to "mutated", diverging from the backed-up
|
||||
"original"), then performed the restore ONCE. The generic restore tier already asserted healthy +
|
||||
serving; this overlay ADDS the recipe-specific check: the volume data returned to the pre-mutation
|
||||
(backed-up) "original". Reads via exec_in_app (volume-direct), robust to the post-restore serving
|
||||
race."""
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner"))
|
||||
from harness import generic, lifecycle # noqa: E402
|
||||
from harness import lifecycle # noqa: E402
|
||||
|
||||
MARKER_PATH = "/usr/share/nginx/html/ci-marker.txt"
|
||||
|
||||
|
||||
def test_restore_returns_state(live_app, meta):
|
||||
domain = live_app
|
||||
generic.do_restore(domain, meta) # restore + assert healthy/serving
|
||||
restored = lifecycle.exec_in_app(domain, ["cat", MARKER_PATH]).strip()
|
||||
def test_restore_returns_state(live_app):
|
||||
restored = lifecycle.exec_in_app(live_app, ["cat", MARKER_PATH]).strip()
|
||||
assert (
|
||||
restored == "original"
|
||||
), f"restore did not return the pre-mutation (backed-up) state: got {restored!r}"
|
||||
|
||||
Reference in New Issue
Block a user