Files
computer-playbook/utils/github/variant/axes.py
T
kevinveenbirkenbachandClaude Opus 5 d9f8af9b16 fix(ci): refuse a mesh pin the row cannot take
A selection token may pin the mesh state as &vpn or &direct, but check_pins
had no arm for it. pinned_vpn_states intersects the pin with the states the
mode allows and only swarm meshes, so a token like @compose+clearnet&vpn left
an empty state list: the row produced no job at all and the run reported green
for a combination that never deployed. That is the outcome _reject exists to
prevent, and every sibling axis already refuses an impossible pin.

The new arm asks whether any candidate mode keeps a state rather than whether
the pin is reachable, so a held vpn axis still overrides the pin instead of
being refused. That behaviour has its own test and is unchanged.

An earlier check was removed with the compose-mesh revert of 2026-10-16
because it rested on meshable() and smallest_variant(), which that revert
deleted. This one reuses pinned_vpn_states, applies to the swarm-only axis the
revert restored, and covers both mesh states instead of only &vpn.

pin_vpn and vpn_mode now reach check_pins from all three callers. The run's
vpn axis reaches the validation job through call-orchestrator and
call-validation, which passed every other axis but this one. The priority
procedure and its skill state all eight axes a token carries, not six:
architecture and mesh were pinnable and, for architecture, already validated,
yet neither was documented.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-10-21 18:13:54 +02:00

397 lines
15 KiB
Python

"""Assign the deploy axes to CI matrix rows.
Every row of the CI matrix is one ``role#variant`` selection. Six axes are
decided here, all as a deterministic rotation over the row's position in the
*global* discovery order and the sweep number -- never at random, so a red job
can be reproduced by re-running the same sweep, and so consecutive sweeps
cover the combinations instead of sampling them:
* **mode** -- which of ``compose``/``swarm``/``host`` the row deploys in,
drawn from the modes the role actually offers. In practice that is at most
two: swarm requires the role to ship its own stack, host requires it not to.
``(position + sweep) % len(offered)`` therefore flips a row between its two
modes on consecutive sweeps.
* **tor** -- whether the row deploys behind the node onion. Driven by
``sweep // 2`` so it does NOT flip in lockstep with the mode.
* **vpn** -- whether a swarm row deploys over the WireGuard mesh
(:mod:`utils.github.variant.vpn`); every other mode takes the direct arm.
* **distro** -- which declared distribution the row deploys on. Per row rather
than per run, so one sweep proves every distribution instead of proving one
and claiming nothing about the other four, and a red row still names the
exact distribution it died on.
* **filesystem** -- which kind the row's docker data root runs on. The two
read the row's position like an odometer, the distro as the low digit, so
consecutive rows walk every pairing rather than a diagonal through it.
Turning both on the position directly would cover only ``n`` of the
``n x m`` pairs whenever the pools are the same length, and no sweep would
unlock it.
* **architecture** -- which CPU architecture the row deploys on, and through
:func:`utils.github.variant.pools.runner_of` which runner it lands on. It
rotates on the position directly rather than as a further odometer digit:
two values against five distros and fifteen distro/filesystem positions are
coprime with both, so walking it fastest still reaches every pairing, while
making it the slowest digit would hand a role with few rows a single
architecture forever. A role may narrow the pool to one value in
``meta/services.yml`` when only that hardware can run it.
A row's position is its index in the uncapped discovery order, not its index
inside a chunk, so slicing the list into chunks never changes what a row is
assigned. A priority row, which deploys several mode/tor combinations at once,
walks the distro and filesystem rotations across those combinations rather
than repeating one pair.
"""
from __future__ import annotations
import os
from typing import TYPE_CHECKING
from utils.github.variant import instructions
from utils.github.variant.label import (
LABEL_RE,
LOCAL_GLYPH,
artifact_slug,
parse_label,
)
from utils.github.variant.pins import check_pins, row_architectures
from utils.github.variant.pools import (
ARCHITECTURES,
DISTROS,
FILESYSTEMS,
MODES,
rotate,
runner_of,
)
from utils.github.variant.tor import (
TOR_DEPLOY_MODES,
combinations,
tor_capable,
tor_provider,
tor_states,
wants_tor,
)
from utils.github.variant.vpn import (
VPN_DEPLOY_MODES,
pinned_vpn_states,
rotated_vpn,
)
from utils.roles.display import display_names
from utils.symbol_glossary import to_emoji
__all__ = [
"ARCHITECTURES",
"DISTROS",
"FILESYSTEMS",
"LABEL_RE",
"LOCAL_GLYPH",
"MODES",
"artifact_slug",
"assign",
"check_pins",
"parse_label",
"pick_mode",
"resolve_sweep",
"row_architectures",
"sort_key",
]
if TYPE_CHECKING:
from collections.abc import Mapping, Sequence
from typing import Any
def resolve_sweep(raw: str | None = None) -> int:
"""Sweep number from ``INFINITO_CI_SWEEP``; it drives both rotations."""
if raw is None:
raw = os.environ.get("INFINITO_CI_SWEEP")
try:
return int((raw or "0").strip())
except ValueError:
return 0
def pick_mode(offered: Sequence[str], position: int, sweep: int) -> str:
"""The deploy mode a row runs in this sweep.
Args:
offered: modes the role supports, in a stable order.
position: the row's index in the global discovery order.
sweep: sweep number.
Raises:
ValueError: *offered* is empty -- a row the query returned always has
at least one mode, so an empty list is a bug upstream, not a case
to paper over with a fallback mode.
"""
if not offered:
raise ValueError("row offers no deploy mode; the query should have dropped it")
return rotate(offered, position, sweep)
def sort_key(entry: Mapping[str, str]) -> tuple[Any, ...]:
"""Where one entry sorts inside its chunk: display name, then variant,
then deploy mode, then onion state.
The chunk split itself is not sorted -- it follows the discovery ranking,
which is what decides who makes the budget cut. This only orders the jobs
a chunk already holds, so a chunk's job list reads like the plan table
instead of like the sweep's rotation.
"""
return (
display_names().encode(entry["apps"]),
tuple(int(part) for part in entry["variant"].split(",") if part),
MODES.index(entry["mode"]) if entry["mode"] in MODES else len(MODES),
entry["tor"] == "true",
)
def assign(
rows: Sequence[Mapping[str, Any]],
*,
sweep: int,
tor_mode: str,
distros: Sequence[str],
filesystems: Sequence[str],
architectures: Sequence[str] = ARCHITECTURES,
vpn_mode: str = "auto",
variants_per_app: Mapping[str, Sequence[Mapping[str, Any]]] | None = None,
) -> list[dict[str, str]]:
"""Turn ordered discovery rows into CI matrix entries.
Args:
rows: discovery rows, each carrying ``name``, ``variant``, ``modes``
(the offered subset) and ``priority``, in global query order.
``pin_mode``/``pin_tor``/``pin_distro``/``pin_filesystem``, when a
selection token set them, pin that axis: the priority line then
covers only the combinations that match, and the regular line takes
the pin instead of its rotation.
sweep: sweep number driving every rotation.
tor_mode: ``enforced`` onions every capable row, ``disabled`` none,
``exclusive`` drops the rows that cannot take one, ``auto``
rotates.
distros: the distributions this run may draw from
(:func:`resolve_pool`).
filesystems: the docker data-root kinds this run may draw from. A pool
of exactly one is a human naming it: the entry then carries
``enforce_filesystem`` and a host that cannot serve it fails
instead of substituting one. A wider pool leaves the kind a
preference, because the matrix narrows every row to one anyway.
vpn_mode: ``enforced`` meshes every swarm row, ``disabled`` none,
``auto`` rotates.
variants_per_app: rendered variant configs per app, so a variant that
switches the tor gate off is never counted capable.
Returns:
one entry per (row, mode, tor) the run deploys, each stamped with the
distro and filesystem its rotation drew, carrying the row's
discovery ``id`` and the ``covered`` id of the earlier row that already
embeds it (``0``: nothing does), so a reader of the plan can tell a
redundant row from a unique one without a second query. A regular row
yields exactly one. A priority row yields every combination
:func:`combinations` allows, so the roles a run is told to prove are
proven everywhere at once rather than sampled over four sweeps.
``disable`` carries the provider tokens
the deploy drill switches off; a row without tor disables the provider
so no dependency edge can pull it back into the closure. The provider's
own rows therefore never take the clearnet state: disabling tor there
would strip the app under test out of its own deploy.
"""
codec = display_names()
provider = tor_provider()
entries: list[dict[str, str]] = []
for position, row in enumerate(rows):
app = row["name"]
variant = row.get("variant")
priority = bool(row.get("priority"))
capable = tor_capable(app, variant, variants_per_app)
offered = tuple(row["modes"])
variant_csv = "" if variant is None else str(variant)
pin_mode = row.get("pin_mode")
pin_tor = row.get("pin_tor")
pin_distro = row.get("pin_distro")
pin_filesystem = row.get("pin_filesystem")
pin_architecture = row.get("pin_architecture")
pin_vpn = row.get("pin_vpn")
offered_architectures = row_architectures(
app, architectures, row.get("services", ())
)
check_pins(
app,
variant_csv,
offered,
pin_mode=pin_mode,
pin_tor=pin_tor,
pin_distro=pin_distro,
pin_filesystem=pin_filesystem,
pin_architecture=pin_architecture,
pin_vpn=pin_vpn,
capable=capable,
tor_mode=tor_mode,
vpn_mode=vpn_mode,
distros=distros,
filesystems=filesystems,
architectures=offered_architectures,
)
if priority:
picked = [
(mode, state, meshed)
for mode, state in combinations(
offered, capable=capable, tor_mode=tor_mode
)
if pin_mode in (None, mode) and pin_tor in (None, state)
for meshed in pinned_vpn_states(mode, pin=pin_vpn, vpn_mode=vpn_mode)
]
else:
mode = pin_mode or pick_mode(
_offering(offered, pin_tor, capable=capable, tor_mode=tor_mode),
position,
sweep,
)
picked = [
(
mode,
state,
rotated_vpn(
mode,
position=position,
sweep=sweep,
pin=pin_vpn,
vpn_mode=vpn_mode,
),
)
for state in _rotated_tor(
mode,
capable=capable,
tor_mode=tor_mode,
position=position,
sweep=sweep,
pin=pin_tor,
)
]
if app == provider:
picked = [entry for entry in picked if entry[1]]
label = codec.encode(app, variant_csv)
for step, (mode, enabled, meshed) in enumerate(picked):
distro = pin_distro or rotate(distros, position + step, sweep)
filesystem = pin_filesystem or rotate(
filesystems, (position + step) // len(distros), sweep
)
architecture = pin_architecture or rotate(
offered_architectures, position + step, sweep
)
glyphs = (
to_emoji(mode)
+ (
to_emoji("tor" if enabled else "clearnet")
if mode in TOR_DEPLOY_MODES
else LOCAL_GLYPH
)
+ (
to_emoji("vpn" if meshed else "direct")
if mode in VPN_DEPLOY_MODES or mode == "compose"
else ""
)
+ to_emoji(distro)
+ to_emoji(filesystem)
+ to_emoji(architecture)
)
entries.append(
{
"apps": app,
"variant": variant_csv,
"mode": mode,
"tor": "true" if enabled else "false",
"vpn": "true" if meshed else "false",
"distro": distro,
"filesystem": filesystem,
"architecture": architecture,
"runner": runner_of(architecture),
"enforce_filesystem": "true"
if pin_filesystem is not None or len(filesystems) == 1
else "false",
"disable": "" if enabled else "tor",
"priority": "true" if priority else "false",
"instructions": "",
"id": str(row.get("id", 0)),
"covered": str(row.get("covered_by", 0)),
"clone": "true" if row.get("clone") else "false",
"artifact": artifact_slug(
mode,
app,
variant_csv,
enabled,
distro,
filesystem,
architecture,
meshed,
),
"label": f"{glyphs}{label}"
+ (f" {to_emoji('priority')}" if priority else ""),
}
)
return instructions.mark(_one_per_deploy(entries), variants_per_app)
def _one_per_deploy(entries: list[dict[str, str]]) -> list[dict[str, str]]:
"""Collapse entries that describe the same deployment, keeping the first.
Two selection tokens can pin different axes of one row -- ``role#0%debian``
and ``role#0/zfs`` -- and each leaves the other's axis to the rotation. When
the rotation lands on exactly that value, both tokens resolve to the same
deploy. That is one job, not two: they would carry one artifact name, and
``actions/upload-artifact`` rejects the second upload rather than merging
it. The artifact slug is the identity because it is precisely what
distinguishes one deploy job's output from another's.
``enforce_filesystem`` is OR-ed rather than taken from the survivor: the
token that pinned the kind may be the one collapsing into a token that did
not, and dropping its demand would let the deploy fall back to a filesystem
the operator explicitly named against.
"""
kept: dict[str, dict[str, str]] = {}
for entry in entries:
first = kept.setdefault(entry["artifact"], entry)
if entry["enforce_filesystem"] == "true":
first["enforce_filesystem"] = "true"
return list(kept.values())
def _offering(
offered: Sequence[str], pin: bool | None, *, capable: bool, tor_mode: str
) -> tuple[str, ...]:
"""The modes the rotation may still draw from once an onion state is
pinned: pinning the onion on a row that also offers host must not rotate
the row onto host, where no onion exists."""
if pin is None:
return tuple(offered)
return tuple(
mode
for mode in offered
if pin in tor_states(mode, capable=capable, tor_mode=tor_mode)
)
def _rotated_tor(
mode: str,
*,
capable: bool,
tor_mode: str,
position: int,
sweep: int,
pin: bool | None = None,
) -> list[bool]:
"""The single onion state a regular row takes this sweep, or nothing when
``exclusive`` drops it. A pinned state replaces the rotation -- it was
proven possible by :func:`check_pins` before we get here."""
allowed = tor_states(mode, capable=capable, tor_mode=tor_mode)
if pin is not None:
return [pin]
if len(allowed) < 2:
return allowed
return [capable and wants_tor(position, sweep)]