7.0 KiB
REVIEW — phase prevb (Adversary verdicts)
Append-only. Gates this phase: M1 (implemented + green locally), M2 (proven in real CI + spot-check).
SSOT: /srv/cc-ci/cc-ci-plan/plan-phase-prevb-previous-dynamic-base.md.
Status
- 2026-06-16T23:57Z — Adversary live for
prevb. No Builder claim yet (no STATUS-prevb.md, noclaim(). Cold-start recon done: baseline mechanism understood —- base resolution:
run_recipe_ci.upgrade_base→meta.UPGRADE_BASE_VERSION or lifecycle.previous_version(vers[-2]); discourse pins0.7.0+3.3.1. - overlay
tests/discourse/compose.ccci.ymlapplied to ALL deploys viaEXTRA_ENV.COMPOSE_FILE; fuses environmental (start_period 20m, order stop-first) + version-specific (bitnamilegacy image pin + sidekiq block) — the bug. - existing unit tests to watch for weakening:
tests/unit/test_upgrade_base.py,tests/unit/test_meta.py. Idle until a gate is CLAIMED.
- base resolution:
- 2026-06-17T00:12Z — Independently cold-verified the Builder's STATUS ground-truth facts via gitea API
(NOT trusting STATUS): PR #4 head
ae5a81802b4d1d6cd1b449ac46cfa16d80730aaacompose.yml→app.image = discourse/discourse:3.5.3, nosidekiqservice;.diffshows-bitnamilegacy/discourse:3.5.0→+discourse/discourse:3.5.3+ fullsidekiq:block removed. main →app+sidekiq=bitnamilegacy/discourse:3.5.0, sidekiq present, basef87c612d. Facts CONFIRMED. (Caution noted: gitearaw?ref=<shortsha>silently falls back to default branch — must use the FULL sha when cold-verifying head content.) Foundation for "discourse needs no previous/" holds.
Pre-review (M1 code, gate NOT yet CLAIMED — preliminary recon, not a verdict)
2026-06-17T00:30Z — studied the M1 feat commit bb2e3c6 (code/diff only, NOT JOURNAL). Design looks sound:
resolve_upgrade_base→ BasePlan(kind, version, ref, reason): override → last-green (canonical.read_registry) → main-tip (recipe_branch_commit) → skip..runsgates the upgrade tier. head_ref =recipe_head_commit.previous/surface (lifecycle):has_previous,previous_target_version(VERSION marker),previous_status(version-guarded apply/stale), provide/remove overlay, compose_file add/remove. Base-only; stripped before head redeploy (generic.perform_upgrade→remove_previous_overlay+ COMPOSE_FILE strip). Good teeth.- discourse migrated:
compose.ccci.ymlnow ENVIRONMENTAL-ONLY (order: stop-first); bitnamilegacy pins + sidekiq + UPGRADE_BASE_VERSION removed.test_upgrade.pyasserts runningappimage == officialdiscourse/discourse:3.5.3(not bitnamilegacy) + sidekiq gone; resolves as the upgrade-tier overlay (resolve_overlay_op→test_{op}.py), run as its own pytest → rc!=0 fails the tier. Real teeth confirmed. - Unit tests run cold (nix pytest): 63 passed (test_upgrade_base + test_previous + test_meta). Matrix EXPANDED, not weakened (override-wins / last-green-primary / main-tip-fallback / head==main-tip skip / no-pred skip).
STILL REQUIRED for the formal M1 PASS (needs the Builder's e2e claim + my cold acceptance run):
(a) discourse upgrade tier GREEN locally with proof the head ran real 3.5.3 (not bitnamilegacy) + no sidekiq;
(b) BREAK-IT: a deliberately-broken head still fails the upgrade tier (base resolution didn't paper over it);
(c) base falls back to main when last-green absent (unit-covered; e2e desirable);
(d) previous/ ignored for the head (code-confirmed; e2e desirable).
Adversary findings (pre-review notes)
- [F-prevb-A] (PRE-EXISTING, NOT a prevb regression; INFO)
tests/unit/test_warm_reconcile.py:: test_traefik_spec_is_stateless_with_setupis RED on main —KeyError: 'health_domain'. Fails identically at the gtea-DONE commit778720c(verified by checkout), and the prevb feat never touched warm_reconcile — thepxgate-M1traefik-probe change (0e9fd38) refactored the spec without updating this test. Out of prevb scope, but it means the FULLtests/unit/suite is NOT all-green (283 pass / 1 fail). Flagging so "unit green" claims are scoped honestly. Not an M1 blocker. - [F-prevb-B] (NIT) old
test_expected_na_other_rung_does_not_suppresswas dropped in the rewrite; the behavior (an EXPECTED_NA for a non-upgrade rung must not suppress the base) is preserved via.get("upgrade")but no longer has a dedicated test. Low risk; consider re-adding one line of coverage.
M1 cold acceptance — IN FLIGHT (2026-06-17T00:42Z)
Gate M1 CLAIMED @00:40Z (code commit e1b32ea; claim commit bb79e91 = machine-docs only). Cold-verifying from a
FRESH clone on cc-ci (/root/cc-ci-adv-prevb @ bb79e91), not the Builder's tree.
Done so far (cold):
- prevb unit surface: 64 passed (
test_upgrade_base+test_previous+test_meta) via nix pytest. - statics:
compose.ccci.ymlenv-only (order: stop-first); discourserecipe_meta.pyhas NOUPGRADE_BASE_VERSIONassignment. prune_orphan_servicesreviewed: removes only services NOT in the head compose → cannot mask the prevb bug (if overlay leaked sidekiq into the head compose it'd be indefined→ not pruned → test RED). Teeth preserved.- e2e launched (
RECIPE=discourse SRC=recipe-maintainers/discourse REF=ae5a8180… PR=4 STAGES=install,upgrade), runmanual-1344943. Early log CONFIRMSupgrade base: kind=ref ref=f87c612d71b4 (target-branch (main) tip)→ base = main-tip chaos deploy (matches claim). Base deploy (main-tip, has the known sidekiq depends_on bug) in progress; observed a non-fatallint rung: fail R011on the base — watching whether it blocks. - CONCURRENCY observed: a Builder keycloak spot-check (PR#3) runs simultaneously in
/root/prevb-deploy. My discourse run's janitor saw the keycloak lock and LEFT IT (live concurrent run, leaving it) — per-run ABRA_DIR isolation holding. Watching for memory-pressure false-failures on the shared 7GB node. UPDATE 2026-06-17T01:00Z (post-reboot, cold re-check of completed run): - e2e
manual-1344943COMPLETED GREEN (read full log /root/cc-ci-adv-prevb-e2e.log):upgrade base: kind=ref ref=f87c612d71b4 (target-branch (main) tip);upgrade→PR-head head_ref=ae5a8180; generictest_upgrade_reconvergesPASSED; discoursetest_head_runs_official_image_not_bitnamilegacyPASSED +test_sidekiq_service_dropped_by_headPASSED; RUN SUMMARY deploy-count=1 (expect 1), install:pass upgrade:pass, level=2/5. Matches STATUS EXPECTED exactly. - TEARDOWN clean:
docker stack lsshows NO discourse stack; no discourse secrets/volumes. (warm-keycloak stack present = Builder's concurrent spot-check, not mine.) - BREAK-IT: my first probe (
manual-1357729, broken-head ref 94ebaaa = head imagediscourse/discourse:99.99.99-adversary-broken) was SIGTERM-killed mid-base-deploy by MY reboot — INCOMPLETE. RE-LAUNCHED asmanual-1360025(same broken head, base resolving to main-tip f87c612d as expected). In flight. STILL TO CONFIRM: break-itmanual-1360025→ upgrade tier RED (broken head not papered over).
Verdicts
(none yet — M1 cold acceptance in flight)
Open VETOes
(none)