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,28 +1,16 @@
|
||||
"""keycloak — UPGRADE overlay (Phase 1d, DG4): data-continuity, extends the generic upgrade.
|
||||
"""keycloak — UPGRADE overlay (Phase 1e HC3): data-continuity, assertion-only + additive.
|
||||
|
||||
The orchestrator deployed the previous published version ONCE; this overlay creates a marker realm
|
||||
(DB data in mariadb) on the live app, performs the in-place upgrade via the shared op helper
|
||||
(`generic.do_upgrade`, which also asserts reconverge + serving + that the deployment moved), then
|
||||
asserts the realm SURVIVED (mariadb data preserved). Assertion-only on the shared deployment."""
|
||||
ops.pre_upgrade created a marker realm (mariadb) before the upgrade; the orchestrator performed the
|
||||
upgrade once (generic tier asserted reconverge/serving/moved). This overlay ADDS: the realm survived
|
||||
(mariadb data preserved). Re-auths post-upgrade."""
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner"))
|
||||
import kc_admin # noqa: E402
|
||||
from harness import generic # noqa: E402
|
||||
|
||||
|
||||
def test_upgrade_preserves_realm(live_app, meta):
|
||||
domain = live_app
|
||||
pw = kc_admin.admin_password(domain)
|
||||
tok = kc_admin.admin_token(domain, pw)
|
||||
assert kc_admin.create_marker_realm(domain, tok) in (201, 409)
|
||||
assert kc_admin.marker_realm_exists(domain, tok), "marker realm not created"
|
||||
|
||||
# in-place upgrade previous -> target (reuses the generic op: upgrade + assert reconverge/serving)
|
||||
generic.do_upgrade(domain, os.environ.get("VERSION") or None, meta)
|
||||
|
||||
# re-auth (token from the old instance is fine, but get a fresh one post-upgrade) and verify
|
||||
tok2 = kc_admin.admin_token(domain, pw)
|
||||
assert kc_admin.marker_realm_exists(domain, tok2), "realm did not survive the upgrade"
|
||||
def test_upgrade_preserves_realm(live_app):
|
||||
tok = kc_admin.admin_token(live_app, kc_admin.admin_password(live_app))
|
||||
assert kc_admin.marker_realm_exists(live_app, tok), "realm did not survive the upgrade"
|
||||
|
||||
Reference in New Issue
Block a user