didericis-claude
dee0121e8d
prd-number-check / require-numbered-prds (pull_request) Successful in 13s
tracker-policy-pr / check-pr (pull_request) Successful in 7s
test / image-input-builds (pull_request) Successful in 41s
test / unit (pull_request) Successful in 51s
test / integration-docker (pull_request) Successful in 58s
test / coverage (pull_request) Successful in 41s
test / image-input-builds (push) Successful in 48s
test / unit (push) Successful in 56s
lint / lint (push) Successful in 1m2s
Update Quality Badges / update-badges (push) Successful in 1m4s
test / integration-docker (push) Failing after 2m53s
test / coverage (push) Has been skipped
On a Firecracker gateway cold boot, reconcile every live agent VM against the fresh gateway: push the new mitmproxy CA into each agent's trust store, re-provision git-gate repos/creds from the persisted upstreams snapshot, and restore egress tokens. Per-bottle failures are logged and skipped so one unreachable VM does not block the rest. New modules / changes: - backend/firecracker/reconcile.py: attach_bottled_agents_to_gateway, _push_ca, _reprovision_git_gate, _guest_ip_from_config - git_gate/provision.py: write upstreams.json after key provisioning so the bring-up reconcile can reconstruct the upstream table without the manifest - backend/firecracker/infra.py: call attach_bottled_agents_to_gateway in the cold-boot branch of ensure_running() - backend/base.py: no-op default on BottleBackend - backend/firecracker/consolidated_launch.py: remove superseded _reprovision_running_bottles / _guest_ip_from_config - orchestrator: OrchestratorCore.update_agent_secret + POST /bottles/<id>/secret + client.update_agent_secret (single-secret in-place update, the reusable primitive from the 2026-07-26 hotfix) - tests: 15 new tests in test_firecracker_reconcile.py; updated test_firecracker_infra.py cold-boot cases; stale FC reprovision tests removed from test_backend_secret_reprovision.py Closes #516.
50 lines
1.6 KiB
Python
50 lines
1.6 KiB
Python
"""Build shim. Project metadata lives in ``pyproject.toml``; this only adds a
|
|
build step that copies the root-level build resources (the Dockerfiles, the
|
|
nix netpool module, the netpool script, and ``pyproject.toml``) into
|
|
``bot_bottle/_resources/`` so an installed wheel is self-contained and can
|
|
build its gateway/infra/orchestrator images without a source checkout.
|
|
|
|
Kept in sync with ``bot_bottle.resources.BUNDLED_RESOURCES`` — the
|
|
``test_resources`` suite guards against drift between the two lists.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import shutil
|
|
from pathlib import Path
|
|
|
|
from setuptools import setup
|
|
from setuptools.command.build_py import build_py
|
|
|
|
_ROOT = Path(__file__).resolve().parent
|
|
|
|
# Must match bot_bottle.resources.BUNDLED_RESOURCES (paths relative to root).
|
|
_BUNDLED_RESOURCES = (
|
|
"pyproject.toml",
|
|
"image-build-args.json",
|
|
"Dockerfile.gateway",
|
|
"Dockerfile.orchestrator",
|
|
"Dockerfile.orchestrator.fc",
|
|
"requirements.gateway.lock",
|
|
"requirements.orchestrator.lock",
|
|
"nix/firecracker-netpool.nix",
|
|
"scripts/firecracker-netpool.sh",
|
|
)
|
|
|
|
|
|
class _BundleResources(build_py):
|
|
"""Copy the root-level build resources into the built package tree so they
|
|
ship inside the wheel under ``bot_bottle/_resources/``."""
|
|
|
|
def run(self) -> None:
|
|
super().run()
|
|
pkg_resources = Path(self.build_lib) / "bot_bottle" / "_resources"
|
|
for rel in _BUNDLED_RESOURCES:
|
|
src = _ROOT / rel
|
|
dst = pkg_resources / rel
|
|
dst.parent.mkdir(parents=True, exist_ok=True)
|
|
shutil.copy2(src, dst)
|
|
|
|
|
|
setup(cmdclass={"build_py": _BundleResources})
|