sjat/boma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(integration-vm): apt-ready VMs + sudo-read serial console diagnostics

Browse source 
cloud-init package_update:true + block on 'cloud-init status --wait' in up() so apply sees populated apt lists (fresh genericcloud images ship empty lists); dump_diagnostics()/console() read the root:0600 serial log via sudo instead of shutil.copy, which raised PermissionError mid-diagnostics.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
sjat 2026-06-18 16:35:15 +02:00
parent 83983d739c
commit 35446538df
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scripts/integration-vm.py
View file

@ -78,7 +78,7 @@ def render_user_data(ssh_pubkey, ansible_user):
" ssh_authorized_keys:\n" " ssh_authorized_keys:\n"
f" - {ssh_pubkey}\n" f" - {ssh_pubkey}\n"
"ssh_pwauth: false\n" "ssh_pwauth: false\n"
"package_update: false\n" "package_update: true\n"
) )
@ -213,6 +213,9 @@ def up(host, name=None, mem_mib=DEFAULT_MEM_MIB, vcpus=DEFAULT_VCPUS):
"--noautoconsole"]) "--noautoconsole"])
ip = wait_for_ip(name) ip = wait_for_ip(name)
wait_for_ssh(ip, "ansible") wait_for_ssh(ip, "ansible")
# Block until cloud-init finishes (incl. apt-get update) so apply sees a ready system.
sh(["ssh", "-o", "StrictHostKeyChecking=no", "-o", "UserKnownHostsFile=/dev/null",
f"ansible@{ip}", "sudo cloud-init status --wait"], check=False)
(RUN_DIR / "current").write_text(f"{name}\n{ip}\n{host}\n") (RUN_DIR / "current").write_text(f"{name}\n{ip}\n{host}\n")
print(f"VM {name} up at {ip}") print(f"VM {name} up at {ip}")
return name, ip return name, ip
@ -341,7 +344,10 @@ def dump_diagnostics(name, ip):
(d / f"{label}.txt").write_text((r.stdout or "") + (r.stderr or "")) (d / f"{label}.txt").write_text((r.stdout or "") + (r.stderr or ""))
console = CACHE_DIR / f"{name}-console.log" console = CACHE_DIR / f"{name}-console.log"
if console.exists(): if console.exists():
shutil.copy(console, d / "console.log") # The serial log is root:0600 (libvirt-created); read it via sudo (ADR-015: the
# claude worker has sudo) and write a worker-owned copy into the bundle.
r = sh(["sudo", "cat", str(console)], check=False, capture=True)
(d / "console.log").write_text(r.stdout or "")
print(f"diagnostics written to {d}", file=sys.stderr) print(f"diagnostics written to {d}", file=sys.stderr)
@ -377,7 +383,10 @@ def prune():
def console(): def console():
name = (RUN_DIR / "current").read_text().splitlines()[0] name = (RUN_DIR / "current").read_text().splitlines()[0]
log = CACHE_DIR / f"{name}-console.log" log = CACHE_DIR / f"{name}-console.log"
print(log.read_text() if log.exists() else f"no console log at {log}") if log.exists():
print(sh(["sudo", "cat", str(log)], check=False, capture=True).stdout or "")
else:
print(f"no console log at {log}")
def cycle(host, certs, keep=False, no_reboot=False): def cycle(host, certs, keep=False, no_reboot=False):