test(discourse): UPGRADE_BASE_FLOOR — exclude structurally-invalid upgrade bases
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
The 0.8.x->1.0.0 discourse recipe family switched app bitnami->official AND db pgvector/pg17->discourse/postgres:pg18. That db-family change is a structural break (bitnami cluster lacks the discourse role; pg_upgrade preserves-not-creates roles) with NO supported in-place path. The dynamic base resolver's step-back kept selecting 0.8.1+3.5.0 (newest tag below the unbumped 1.0.0+3.5.3 label) and the upgrade tier red'd twice on this unsupported path (drone #1165, #1171 — classified stale-test both times; recipe verified green on the real official->official path). Adds UPGRADE_BASE_FLOOR (phase basefloor) to resolve_upgrade_base: a recipe_meta declaration naming the first post-break published version. Resolution stays fully dynamic (this is NOT the removed sec2.G static pin): the floor only EXCLUDES below-floor candidates (canonical, step-back, no-canonical fallback); when no >=floor predecessor exists the tier records a DECLARED skip, never a silent pass. main-tip fallback unaffected (post-break by construction). tests/discourse/recipe_meta.py declares UPGRADE_BASE_FLOOR = 1.0.0+3.5.3 with the full rationale. Unit-verified: head=1.0.0+3.5.3 -> declared skip (was: 0.8.1+3.5.0 wrong pick); post-release head=2026.x -> base 1.0.0+3.5.3 (the real migration path). No assertion weakened - below-floor in-place upgrades were never supported coverage.
This commit is contained in:
@ -151,8 +151,30 @@ def resolve_upgrade_base(
|
||||
flush=True,
|
||||
)
|
||||
return BasePlan("skip", None, None, f"declared EXPECTED_NA[upgrade]: {declared}")
|
||||
# UPGRADE_BASE_FLOOR (phase basefloor): a recipe_meta declaration marking a STRUCTURAL breaking
|
||||
# boundary — published versions strictly below the floor are not valid in-place upgrade sources
|
||||
# (e.g. discourse 0.8.x→1.0.0 changed the db family bitnami/pgvector → discourse/postgres; the
|
||||
# data layout+roles are incompatible, upstream supports no in-place path across it). This is NOT
|
||||
# the removed UPGRADE_BASE_VERSION pin (§2.G): resolution stays fully dynamic — the floor only
|
||||
# EXCLUDES structurally-impossible bases, and when no candidate ≥ floor exists the tier records
|
||||
# a DECLARED skip (never a silent pass). Never weakens: below-floor upgrades were never a
|
||||
# supported path, so no real coverage is lost.
|
||||
floor = getattr(meta, "UPGRADE_BASE_FLOOR", None)
|
||||
|
||||
def _below_floor(version: str) -> bool:
|
||||
return bool(floor) and warm_reconcile.version_key(version) < warm_reconcile.version_key(
|
||||
floor
|
||||
)
|
||||
|
||||
skip_canonicals = settings_mod.get().skip_canonicals_for_upgrade
|
||||
rec = canonical.read_registry(recipe)
|
||||
if rec and rec.get("version") and not skip_canonicals and _below_floor(rec["version"]):
|
||||
print(
|
||||
f"== upgrade tier: last-green canonical {rec['version']} is below the declared "
|
||||
f"UPGRADE_BASE_FLOOR {floor} (structural break) — excluded as a base",
|
||||
flush=True,
|
||||
)
|
||||
rec = None
|
||||
if rec and rec.get("version") and not skip_canonicals:
|
||||
canon = rec["version"]
|
||||
same = head_version is not None and warm_reconcile.version_key(
|
||||
@ -168,10 +190,20 @@ def resolve_upgrade_base(
|
||||
f"last-green (warm canonical, status={rec.get('status')})",
|
||||
)
|
||||
# canonical == head version → deploying it would be a same-version no-op. Step back to the
|
||||
# newest published version strictly older than the head (phase samever).
|
||||
older = warm_reconcile.newest_older_version(
|
||||
warm_reconcile.recipe_tags(recipe), head_version
|
||||
)
|
||||
# newest published version strictly older than the head (phase samever). Candidates below a
|
||||
# declared UPGRADE_BASE_FLOOR are excluded (phase basefloor — structurally invalid bases).
|
||||
_tags = warm_reconcile.recipe_tags(recipe)
|
||||
if floor:
|
||||
_tags = [t for t in _tags if not _below_floor(t)]
|
||||
older = warm_reconcile.newest_older_version(_tags, head_version)
|
||||
if older is None and floor:
|
||||
return BasePlan(
|
||||
"skip",
|
||||
None,
|
||||
None,
|
||||
f"declared UPGRADE_BASE_FLOOR {floor}: no published predecessor ≥ floor below "
|
||||
f"head {head_version} (all older tags cross a structural break)",
|
||||
)
|
||||
if older:
|
||||
return BasePlan(
|
||||
"version",
|
||||
@ -189,10 +221,12 @@ def resolve_upgrade_base(
|
||||
# No canonical in play — none recorded, OR SKIP_CANONICALS_FOR_UPGRADE=true (canonical lookup
|
||||
# bypassed entirely, behaving as if none exists). Improved fallback (phase settings §2.C): prefer
|
||||
# a REAL published predecessor (newest release tag < head) over the raw main-tip.
|
||||
return _no_canonical_base(recipe, head_ref, head_version)
|
||||
return _no_canonical_base(recipe, head_ref, head_version, floor=floor)
|
||||
|
||||
|
||||
def _no_canonical_base(recipe: str, head_ref: str | None, head_version: str | None) -> BasePlan:
|
||||
def _no_canonical_base(
|
||||
recipe: str, head_ref: str | None, head_version: str | None, floor: str | None = None
|
||||
) -> BasePlan:
|
||||
"""Upgrade base when no canonical is used (none recorded, its promote failed, or
|
||||
SKIP_CANONICALS_FOR_UPGRADE is true). Release-tag-first fallback (phase settings §2.C):
|
||||
1. most recent release TAG with version strictly older than the PR head — a clean published
|
||||
@ -202,11 +236,14 @@ def _no_canonical_base(recipe: str, head_ref: str | None, head_version: str | No
|
||||
3. skip — no predecessor (no older tag and head == main-tip, or no main at all).
|
||||
This replaces the old jump-straight-to-main-tip path, so an un-promoted recipe upgrades from a real
|
||||
release base instead of a possibly-untagged WIP commit."""
|
||||
older = (
|
||||
warm_reconcile.newest_older_version(warm_reconcile.recipe_tags(recipe), head_version)
|
||||
if head_version
|
||||
else None
|
||||
)
|
||||
_tags = warm_reconcile.recipe_tags(recipe)
|
||||
if floor:
|
||||
# phase basefloor: exclude structurally-invalid bases below the declared floor; the
|
||||
# main-tip fallback below remains available (it is post-break by definition of the
|
||||
# declaration — the floor names the first post-break published version).
|
||||
_fk = warm_reconcile.version_key(floor)
|
||||
_tags = [t for t in _tags if warm_reconcile.version_key(t) >= _fk]
|
||||
older = warm_reconcile.newest_older_version(_tags, head_version) if head_version else None
|
||||
if older:
|
||||
return BasePlan(
|
||||
"version",
|
||||
|
||||
Reference in New Issue
Block a user