Mechanical, semantics-preserving cleanup so the codebase passes the new lint stage:
- ruff format: all 32 Python files (wraps long signatures, normalizes quotes/blank lines).
- nixpkgs-fmt: modules/drone-runner.nix.
- shfmt (-i 2 -ci): scripts/*.sh.
Lint fixes (reviewed, behavior-preserving — no test weakened):
- ruff SIM105: try/except-pass -> contextlib.suppress (abra.py app_config rm; lifecycle.py janitor).
- ruff SIM115: open().read() -> with open() (run_recipe_ci.py redaction-values + gitea-token).
- statix: merge repeated sops `secrets.*` keys into one `secrets = { ... }` (comments kept);
empty fn pattern `{ ... }:` -> `_:` (packages.nix).
- deadnix: drop unused lambda args (flake `self`; configuration.nix `lib`; overlay `final` -> `_`).
Verified on cc-ci: `scripts/lint.sh` -> lint: PASS; nixosConfigurations.cc-ci evaluates;
all Python byte-compiles. The deployed bridge/dashboard/runner source changes hash (reformat),
so cc-ci will be rebuilt to the new closure in W2 before the cold D1-D10 re-verification.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
97 lines
3.4 KiB
Python
97 lines
3.4 KiB
Python
"""Shared pytest fixtures for recipe CI (plan §4.3).
|
|
|
|
A run is parameterized by env: RECIPE, REF (PR head sha), PR, SRC (head repo). The harness
|
|
computes a unique app domain per run so concurrent runs never collide, and GUARANTEES teardown
|
|
(undeploy + volume + secret removal) via a finalizer, even on failure.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import sys
|
|
|
|
import pytest
|
|
|
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "runner"))
|
|
from harness import lifecycle, naming # noqa: E402
|
|
|
|
|
|
def _short(s: str, n: int = 8) -> str:
|
|
return "".join(c for c in s if c.isalnum())[:n] or "local"
|
|
|
|
|
|
def _recipe_meta(recipe: str) -> dict:
|
|
"""Optional per-recipe config so enrolling a recipe needs NO shared-harness change (D5).
|
|
A recipe may ship tests/<recipe>/recipe_meta.py with any of: HEALTH_PATH (str),
|
|
HEALTH_OK (tuple of status codes), DEPLOY_TIMEOUT (int), HTTP_TIMEOUT (int)."""
|
|
path = os.path.join(os.path.dirname(__file__), recipe, "recipe_meta.py")
|
|
meta = {
|
|
"HEALTH_PATH": "/",
|
|
"HEALTH_OK": (200, 301, 302),
|
|
"DEPLOY_TIMEOUT": 600,
|
|
"HTTP_TIMEOUT": 300,
|
|
}
|
|
if os.path.exists(path):
|
|
ns: dict = {}
|
|
with open(path) as fh:
|
|
exec(compile(fh.read(), path, "exec"), ns) # noqa: S102 (trusted, in-repo)
|
|
for k in meta:
|
|
if k in ns:
|
|
meta[k] = ns[k]
|
|
return meta
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def recipe() -> str:
|
|
return os.environ.get("RECIPE", "custom-html")
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def app_domain(recipe) -> str:
|
|
# Docker swarm config/secret names = <stackname>_<res>_<ver> must be <= 64 chars, and
|
|
# stackname is the sanitized domain. ".ci.commoninternet.net" alone is 22 chars, so the
|
|
# subdomain label must stay short. Use <recipe[:4]>-<6hex(recipe|pr|ref)> — unique per run,
|
|
# collision-safe across recipes (full recipe in the hash), readable context lives in the
|
|
# Drone build params + PR comment. (Deviation from plan §4.0 long name; see DECISIONS.md.)
|
|
return naming.app_domain(recipe, os.environ.get("PR", "0"), os.environ.get("REF"))
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def meta(recipe) -> dict:
|
|
return _recipe_meta(recipe)
|
|
|
|
|
|
def _wait_healthy(domain, meta):
|
|
lifecycle.wait_healthy(
|
|
domain,
|
|
ok_codes=tuple(meta["HEALTH_OK"]),
|
|
path=meta["HEALTH_PATH"],
|
|
deploy_timeout=meta["DEPLOY_TIMEOUT"],
|
|
http_timeout=meta["HTTP_TIMEOUT"],
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def deployed(recipe, app_domain, meta, request):
|
|
"""Function-scoped: deploy the current/$REF version healthy, guaranteed teardown after.
|
|
Used by stages that start from current (install/backup)."""
|
|
version = os.environ.get("VERSION") or None
|
|
lifecycle.janitor()
|
|
request.addfinalizer(lambda: lifecycle.teardown_app(app_domain))
|
|
lifecycle.deploy_app(recipe, app_domain, version=version)
|
|
_wait_healthy(app_domain, meta)
|
|
return app_domain
|
|
|
|
|
|
@pytest.fixture(scope="session")
|
|
def deployed_app(recipe, app_domain, meta):
|
|
"""Install stage: deploy the recipe and wait until healthy; tear down at session end."""
|
|
version = os.environ.get("VERSION") or None
|
|
lifecycle.janitor() # sweep orphans from crashed runs first
|
|
try:
|
|
lifecycle.deploy_app(recipe, app_domain, version=version, secrets=True)
|
|
_wait_healthy(app_domain, meta)
|
|
yield app_domain
|
|
finally:
|
|
lifecycle.teardown_app(app_domain)
|