- 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>
24 lines
946 B
Python
24 lines
946 B
Python
"""matrix-synapse — BACKUP overlay (Phase 1e HC3): assertion-only + additive.
|
|
|
|
ops.pre_backup wrote "original" into postgres before the backup op (pg_backup.sh dumps the DB); the
|
|
orchestrator performed the backup once (generic tier asserted a snapshot artifact). This overlay
|
|
ADDS: the seeded row is intact at backup time. The backup→restore divergence (dropping the table) is
|
|
in ops.pre_restore."""
|
|
|
|
import os
|
|
import sys
|
|
|
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner"))
|
|
from harness import lifecycle # noqa: E402
|
|
|
|
|
|
def _psql(domain, sql):
|
|
cmd = f'PGPASSWORD=$(cat /run/secrets/db_password) psql -U synapse -d synapse -tAc "{sql}"'
|
|
return lifecycle.exec_in_app(domain, ["sh", "-c", cmd], service="db").strip()
|
|
|
|
|
|
def test_backup_captures_state(live_app):
|
|
assert (
|
|
_psql(live_app, "SELECT v FROM ci_marker;") == "original"
|
|
), "the seeded postgres state was not present at backup time"
|