mirror of
https://github.com/rennf93/roboco.git
synced 2026-08-03 07:23:24 +02:00
feat(env-branches): per-project ordered environment ladder (replaces default_branch) (#534)
* [env-bran] EnvSyncEngine: orchestrator-side prod→dev cascade (default-off) - EnvSyncEngine mirrors CiWatchEngine: cascade ladder_pairs top-down via GitHub merges API; clean→auto-push lower rung, conflict→one sync PR + tracked MAIN_PM task + stop. Never pushes prod (lower rung is never prod by construction). - GitService.sync_env_branch (merges API) + open_sync_pr (idempotent) + _env_merge_status/_post_sync_pr helpers (constants for 201/204/409). - TaskService.ENV_SYNC_SOURCE + list_open_env_sync_tasks (per-repo dedup). - config env_sync_enabled/_interval_seconds(1800)/_max_open_tasks(3)/_max_per_cycle(1). - Orchestrator 4-touch registration + _load_env_sync_set (ladder+token opt-in). - Feature-flags card + settings FEATURE_FLAGS entry for ROBOCO_ENV_SYNC_ENABLED. * [env-bran] Panel: environment ladder editor + types + validation - EnvironmentRung type + environments on Project/ProjectCreate/ProjectUpdate. - EnvironmentLadderEditor (plain useState, add/remove/up-down reorder, head/ prod labels) reused by create + edit project dialogs. - validateLadder (non-empty name+branch, no duplicate branches) shared, toast.error on submit; empty editor => null => inherits default_branch shim. - default_branch input kept with override-hint; API client passthrough. - 6 unit tests for validateLadder. * [env-bran] Tests + gate green: env ladder, EnvSyncEngine, promotion chain - tests/unit/models/test_env_branches.py: shim, head/prod, ladder_pairs, promotion_chain, normalize (20 tests) - tests/integration/services/test_env_sync_engine.py: cascade clean/conflict/ missing_ref/tokenless/degenerate/caps/dedup/disabled (9 tests, DB) - tests/integration/test_migration_env_branches.py: 073 defaults null + round-trip - tests/unit/services/test_release_executor*.py: add env_chain=[] to _ReleaseContext constructions (promotion_chain field is now required) - tests/unit/runtime/test_orchestrator_shutdown_drain.py: register _env_sync_task in the stop()-drain fixture (new named background loop) - roboco/services/git.py: revert _project_head_branch rename back to _project_default_branch (modify-in-place per plan); the rename in the consumers commit broke ~15 unit-test mocks that bind the original name - roboco/services/env_sync_engine.py + models/env_branches.py: ruff format - roboco/api/schemas/project.py: trailing-newline format Backend gate green (13013 passed / 439 skipped), mypy clean, ruff clean. Panel gate green (typecheck/lint/522 tests). * [env-bran] fix: add env_chain to _ReleaseContext in e2e smoke (CI red) The release-executor promotion_chain change made _ReleaseContext.env_chain required. I fixed the three unit/release test files but missed the construction in tests/e2e_smoke/test_background_engines.py:98 — my local gate ran 'mypy roboco/' (excludes tests/) and I skipped 'make e2e-smoke', so CI's mypy-on-tests + the e2e runtime job caught it instead of me. Verified locally with the CI-equivalent gates: uv run mypy roboco/ tests/ -> 1170 files, clean ROBOCO_E2E_SMOKE=1 uv run pytest tests/e2e_smoke -> 50 passed, 1 skipped * [env-bran] fix: extract _ensure_prod_fetched to clear xenon rank C (CI red) _production_assess grew past xenon --max-absolute B (rank C) when the env-branches prod-tip fetch added an if/try/except branch. Extracted the fetch-with-fallback into _ensure_prod_fetched (degan+fetch paths), moved _run_git to the module-level import. Local make quality green (all gates incl xenon/vulture/deptry/import-linter/foundation-check). --------- Co-authored-by: Renn F <rennf93@users.noreply.github.com>
This commit is contained in:
@@ -70,6 +70,9 @@ class _FakeOps:
|
||||
# instance (not via __init__ — keeps the constructor under the arg-count
|
||||
# gate) by tests that exercise the retry path.
|
||||
self._existing_sha: str | None = None
|
||||
# env-chain promotion failure message; set on the instance (same arg-
|
||||
# count-gate reason) by the promotion-failure test.
|
||||
self._promote_raises: str | None = None
|
||||
self.calls: list[str] = []
|
||||
self.bumped_plan: list[str] | None = None
|
||||
self.bumped_version: str | None = None
|
||||
@@ -79,6 +82,11 @@ class _FakeOps:
|
||||
self.calls.append("check")
|
||||
return self._already
|
||||
|
||||
async def promote_env_chain(self) -> None:
|
||||
self.calls.append("promote")
|
||||
if self._promote_raises is not None:
|
||||
raise RuntimeError(self._promote_raises)
|
||||
|
||||
async def release_commit_sha(self, _version: str) -> str | None:
|
||||
# Half-landed detection: a prior `chore(release): {version}` commit
|
||||
# already on the branch means a publish_failed retry must NOT re-run the
|
||||
@@ -127,6 +135,7 @@ async def test_green_path_publishes_once() -> None:
|
||||
assert ops.calls.count("publish") == _ONE
|
||||
assert ops.calls == [
|
||||
"check",
|
||||
"promote",
|
||||
"bump",
|
||||
"changelog",
|
||||
"gate",
|
||||
@@ -204,6 +213,22 @@ async def test_publish_failure_returns_structured_publish_failed() -> None:
|
||||
assert ops.calls.count("publish") == _ONE
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_promotion_failure_aborts_before_bump() -> None:
|
||||
"""A RuntimeError from promote_env_chain (a merge conflict in the
|
||||
head->...->prod chain) becomes a structured ``promotion_failed`` result —
|
||||
fail-closed: the bump/changelog/gate/commit/publish pipeline never runs."""
|
||||
ops = _FakeOps()
|
||||
ops._promote_raises = "env-chain promotion failed: non-fast-forward"
|
||||
result = await ReleaseExecutor(ops).execute(_report())
|
||||
assert result.status == "promotion_failed"
|
||||
assert result.commit_sha is None
|
||||
assert result.release_url is None
|
||||
assert "bump" not in ops.calls
|
||||
assert "commit" not in ops.calls
|
||||
assert "publish" not in ops.calls
|
||||
|
||||
|
||||
def test_release_result_carries_outcome_fields() -> None:
|
||||
result = ReleaseResult(
|
||||
status="published",
|
||||
@@ -291,6 +316,7 @@ async def test_wait_for_ci_scoped_to_release_commit_not_branch_latest(
|
||||
git_url="x",
|
||||
git_prefix=[],
|
||||
ci_workflow="ci.yml",
|
||||
env_chain=[],
|
||||
)
|
||||
ops = _GitReleaseOps(session=MagicMock(), ctx=ctx)
|
||||
ok = await ops.wait_for_ci(commit_sha)
|
||||
@@ -341,6 +367,7 @@ async def test_wait_for_ci_polls_through_rerun(
|
||||
git_url="x",
|
||||
git_prefix=[],
|
||||
ci_workflow="ci.yml",
|
||||
env_chain=[],
|
||||
)
|
||||
ops = _GitReleaseOps(session=MagicMock(), ctx=ctx)
|
||||
ok = await ops.wait_for_ci(commit_sha)
|
||||
@@ -387,6 +414,7 @@ async def test_wait_for_ci_exhausts_window_on_persistent_failure(
|
||||
git_url="x",
|
||||
git_prefix=[],
|
||||
ci_workflow="ci.yml",
|
||||
env_chain=[],
|
||||
)
|
||||
ops = _GitReleaseOps(session=MagicMock(), ctx=ctx)
|
||||
ok = await ops.wait_for_ci(commit_sha)
|
||||
@@ -515,6 +543,7 @@ async def test_release_push_argv_uses_extraheader_not_url_token(
|
||||
git_url=git_url,
|
||||
git_prefix=git_prefix,
|
||||
ci_workflow=None,
|
||||
env_chain=[],
|
||||
)
|
||||
ops = _GitReleaseOps(session=MagicMock(), ctx=ctx)
|
||||
sha = await ops.commit_and_push("0.13.0")
|
||||
|
||||
Reference in New Issue
Block a user