mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-06 10:59:59 +00:00
kevinveenbirkenbachandClaude Opus 5
575a5a87ac
Every script a role ships now lives under `files/<language>/`, and the unit
suite is split the same way: `tests/unit/python/` beside new sibling trees for
the other languages. `tests/lint/filesystem/test_role_files_layout.py` keeps it
that way; directories whose shape is dictated from outside carry a `.nocheck`
naming the constraint (Docker build contexts, WordPress mu-plugins, the Joomla
extension, Odoo addons, Playwright suites, the `files/test/test.sh` harness
that `test-e2e-cli` resolves generically).
This cannot be applied in halves. Moving a file and repointing what names it
are the same change: 14 references resolve only at deploy time, so the tree is
green either before or after, never between.
Those 14 were found by static resolution over every reference class, not by the
test suite -- a full `make quality-high` was green while all of them were
broken:
* 7 `src:` values built from a role variable holding a bare filename
(svc-bkp-remote-2-local, decidim, espocrm, friendica, joomla, pixelfed x2).
The variable doubles as the destination name inside the container, so the
language segment belongs at the call site, not in the variable.
* `sys-service/tasks/04_base.yml` resolved every consumer's systemd script
through `first_found(..., errors='strict')` over `files/script.{sh,py}`.
18 roles ship exactly that and have no template fallback: the play would
have died on each.
* `sys-front-inj-javascript` fell back to `<role>/files/javascript.js`; the
interface now reads `files/javascript/javascript.js`.
* `sys-front-inj-logout/templates/head_sub.j2` built the cache-busting mtime
path through `path_absolute(... 'files', ...)`.
* 4 `ansible.builtin.script:` invocations naming a bare command
(pull.py, prune.sh, set_postgres_superuser_password.sh, ganesha-serve.sh).
* `dev-python/files/shell/install.sh` pointed at a sibling role's script.
Depth-dependent paths inside the moved trees were bumped accordingly: 59
`parents[N]` computations, 12 relative climbs, and the per-role recover CLI,
whose path `cli/administration/recover/recoverers.py` still assembled from the
pre-move location.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
112 lines
3.7 KiB
Python
112 lines
3.7 KiB
Python
"""Contract of the CI environment image resolver.
|
|
|
|
``scripts/meta/resolve/image/ci.sh`` is what every deploy mode calls to pin the
|
|
distro it is currently on to a prebuilt image, so the reference it prints is
|
|
pinned against ``utils.distros.environment_image`` for every declared distro: a
|
|
locally re-spelled ``ghcr.io/...`` would silently address a different image.
|
|
The absent-owner case prints nothing, which is the caller's signal to build
|
|
locally, and a missing distro or tag aborts instead of rendering a hole.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
import subprocess
|
|
import unittest
|
|
|
|
from utils.cache.files import PROJECT_ROOT
|
|
from utils.distros import distro_names, environment_image
|
|
|
|
RESOLVER = PROJECT_ROOT / "scripts" / "meta" / "resolve" / "image" / "ci.sh"
|
|
STRIPPED = (
|
|
"OWNER",
|
|
"GITHUB_REPOSITORY_OWNER",
|
|
"GITHUB_REPOSITORY",
|
|
"REPO_PREFIX",
|
|
"INFINITO_DISTRO",
|
|
"INFINITO_IMAGE_REPOSITORY",
|
|
"INFINITO_IMAGE_TAG",
|
|
)
|
|
TAG = "ci-abc123"
|
|
|
|
|
|
class TestResolveCiImage(unittest.TestCase):
|
|
def _env(self, **overrides: str) -> dict[str, str]:
|
|
env = {k: v for k, v in os.environ.items() if k not in STRIPPED}
|
|
env["BASH_ENV"] = ""
|
|
env.update(overrides)
|
|
return env
|
|
|
|
def _run(self, script: str, **env: str) -> subprocess.CompletedProcess:
|
|
return subprocess.run(
|
|
[script],
|
|
cwd=PROJECT_ROOT,
|
|
env=self._env(**env),
|
|
capture_output=True,
|
|
text=True,
|
|
check=False,
|
|
)
|
|
|
|
def test_every_distro_renders_the_spot_template(self) -> None:
|
|
for distro in distro_names():
|
|
with self.subTest(distro=distro):
|
|
proc = self._run(
|
|
str(RESOLVER),
|
|
OWNER="acme",
|
|
INFINITO_DISTRO=distro,
|
|
INFINITO_IMAGE_REPOSITORY="infinito-nexus-core",
|
|
INFINITO_IMAGE_TAG=TAG,
|
|
)
|
|
self.assertEqual(proc.returncode, 0, proc.stderr)
|
|
self.assertEqual(
|
|
proc.stdout.strip(),
|
|
environment_image(
|
|
distro,
|
|
owner="acme",
|
|
repository="infinito-nexus-core",
|
|
tag=TAG,
|
|
),
|
|
)
|
|
|
|
def test_repository_is_delegated_to_the_name_resolver(self) -> None:
|
|
proc = self._run(
|
|
str(RESOLVER),
|
|
OWNER="acme",
|
|
REPO_PREFIX="delegated-repo",
|
|
INFINITO_DISTRO="debian",
|
|
INFINITO_IMAGE_TAG=TAG,
|
|
)
|
|
self.assertEqual(proc.returncode, 0, proc.stderr)
|
|
self.assertEqual(
|
|
proc.stdout.strip(),
|
|
environment_image(
|
|
"debian",
|
|
owner="acme",
|
|
repository="delegated-repo",
|
|
tag=TAG,
|
|
),
|
|
)
|
|
|
|
def test_no_registry_owner_in_scope_prints_nothing(self) -> None:
|
|
proc = self._run(
|
|
str(RESOLVER),
|
|
INFINITO_DISTRO="debian",
|
|
INFINITO_IMAGE_TAG=TAG,
|
|
)
|
|
self.assertEqual(proc.returncode, 0, proc.stderr)
|
|
self.assertEqual(proc.stdout.strip(), "")
|
|
|
|
def test_missing_distro_is_a_hard_error(self) -> None:
|
|
proc = self._run(str(RESOLVER), OWNER="acme", INFINITO_IMAGE_TAG=TAG)
|
|
self.assertNotEqual(proc.returncode, 0)
|
|
self.assertIn("INFINITO_DISTRO", proc.stderr)
|
|
|
|
def test_missing_tag_is_a_hard_error(self) -> None:
|
|
proc = self._run(str(RESOLVER), OWNER="acme", INFINITO_DISTRO="debian")
|
|
self.assertNotEqual(proc.returncode, 0)
|
|
self.assertIn("INFINITO_IMAGE_TAG", proc.stderr)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|