mirror of
https://github.com/kevinveenbirkenbach/computer-playbook.git
synced 2026-11-10 12:47:04 +00:00
kevinveenbirkenbachandClaude Opus 5.5
74d99201e0
Parallel compose slots, swarm lab clusters and GUI lanes each kept their own pip, npm and pacman downloads, and a failed swarm run left its cluster (about 25 GB of node docker data plus the rescue bundle in the act container) on the root filesystem until someone ran make swarm-down. INFINITO_CACHE_SHARED_HOST_PATH (default <DIR_CACHE>/shared) is now mounted read-write at the same path into every compose slot and every swarm lab node, with PIP_CACHE_DIR and npm_config_cache below it; empty, the renders stay byte-identical to before. On a host whose os-release ID is exactly arch running an arch stack, INFINITO_CACHE_HOST_PACMAN_PATH mounts the host pacman cache read-only and scripts/docker/cache/pacman.sh makes it the first CacheDir with <shared>/pacman/ second, so new downloads land in the shared folder and the host cache stays untouched; on Manjaro and every other host pacman uses the shared folder alone. make swarm-zombie without keep=true now copies the act job's rescue diagnostics and Playwright artefacts to the host and then releases the lab nodes, the lab network, the NFS export volume and the act outer container, on success and on failure; when the copy fails the nodes still go, the act container stays and the run exits naming make swarm-down. make roundtrip passes keep to every swarm step, make clean-cache removes the shared folder, and the disc-space cleanup skips pacman cache directories it cannot write. apt and dnf keep their per-container caches behind the package-cache proxy, and no docker data root is shared between daemons. Requirement 065. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
121 lines
3.9 KiB
Python
121 lines
3.9 KiB
Python
"""pacman.sh layers the read-only host cache first and the shared cache second."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import subprocess
|
|
import tempfile
|
|
import unittest
|
|
from pathlib import Path
|
|
|
|
from utils.cache.files import PROJECT_ROOT
|
|
|
|
SCRIPT = PROJECT_ROOT / "scripts" / "docker" / "cache" / "pacman.sh"
|
|
CONF = """\
|
|
[options]
|
|
#CacheDir = /var/cache/pacman/pkg/
|
|
CacheDir = /var/cache/pacman/pkg/
|
|
HoldPkg = pacman glibc
|
|
Architecture = auto
|
|
|
|
[core]
|
|
Include = /etc/pacman.d/mirrorlist
|
|
"""
|
|
|
|
|
|
def layer(conf: Path, shared: Path, host: str) -> subprocess.CompletedProcess:
|
|
"""Run pacman.sh against ``conf``.
|
|
|
|
Args:
|
|
conf: the pacman.conf to rewrite.
|
|
shared: the shared cache root.
|
|
host: the read-only host cache, empty for none.
|
|
"""
|
|
return subprocess.run(
|
|
["bash", str(SCRIPT), str(conf), str(shared), host],
|
|
capture_output=True,
|
|
text=True,
|
|
check=False,
|
|
)
|
|
|
|
|
|
class TestPacmanCacheLayering(unittest.TestCase):
|
|
def setUp(self) -> None:
|
|
self._tmp = tempfile.TemporaryDirectory()
|
|
self.tmp = Path(self._tmp.name)
|
|
self.conf = self.tmp / "pacman.conf"
|
|
self.conf.write_text(CONF)
|
|
self.shared = self.tmp / "shared"
|
|
self.host = self.tmp / "host-pkg"
|
|
self.host.mkdir()
|
|
|
|
def tearDown(self) -> None:
|
|
self._tmp.cleanup()
|
|
|
|
def _text(self) -> str:
|
|
return self.conf.read_text() # nocheck: cache-read the script rewrites it
|
|
|
|
def _options(self) -> list[str]:
|
|
lines = self._text().splitlines()
|
|
return lines[: lines.index("") if "" in lines else len(lines)]
|
|
|
|
def test_host_cache_comes_first_and_shared_cache_second(self) -> None:
|
|
done = layer(self.conf, self.shared, str(self.host))
|
|
self.assertEqual(done.returncode, 0, done.stderr)
|
|
self.assertEqual(
|
|
self._options()[:3],
|
|
[
|
|
"[options]",
|
|
f"CacheDir = {self.host}/",
|
|
f"CacheDir = {self.shared}/pacman/",
|
|
],
|
|
)
|
|
|
|
def test_every_other_cache_dir_is_dropped_and_the_rest_kept(self) -> None:
|
|
layer(self.conf, self.shared, str(self.host))
|
|
text = self._text()
|
|
self.assertNotIn("CacheDir = /var/cache/pacman/pkg/", text)
|
|
self.assertIn("#CacheDir = /var/cache/pacman/pkg/", text)
|
|
self.assertIn("[core]\nInclude = /etc/pacman.d/mirrorlist\n", text)
|
|
|
|
def test_the_shared_pacman_dir_is_created(self) -> None:
|
|
layer(self.conf, self.shared, str(self.host))
|
|
self.assertTrue((self.shared / "pacman").is_dir())
|
|
|
|
def test_a_second_run_changes_nothing(self) -> None:
|
|
layer(self.conf, self.shared, str(self.host))
|
|
first = self._text()
|
|
layer(self.conf, self.shared, str(self.host))
|
|
self.assertEqual(self._text(), first)
|
|
|
|
def test_an_empty_host_cache_leaves_only_the_shared_layer(self) -> None:
|
|
layer(self.conf, self.shared, "")
|
|
self.assertEqual(
|
|
self._options()[:2], ["[options]", f"CacheDir = {self.shared}/pacman/"]
|
|
)
|
|
self.assertEqual(
|
|
sum(line.startswith("CacheDir") for line in self._options()), 1
|
|
)
|
|
|
|
def test_a_system_without_pacman_conf_is_left_alone(self) -> None:
|
|
done = layer(self.tmp / "absent.conf", self.shared, str(self.host))
|
|
self.assertEqual(done.returncode, 0, done.stderr)
|
|
self.assertFalse(self.shared.exists())
|
|
|
|
def test_a_host_cache_that_is_not_mounted_fails(self) -> None:
|
|
done = layer(self.conf, self.shared, str(self.tmp / "missing"))
|
|
self.assertNotEqual(done.returncode, 0)
|
|
self.assertEqual(self._text(), CONF)
|
|
|
|
def test_a_missing_shared_root_fails(self) -> None:
|
|
done = subprocess.run(
|
|
["bash", str(SCRIPT), str(self.conf)],
|
|
capture_output=True,
|
|
text=True,
|
|
check=False,
|
|
)
|
|
self.assertNotEqual(done.returncode, 0)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|