this repo has no description
ci: fix qemu disk path in hosted e2e
+9
-2
+9
-2
tests/e2e/run.py
+9
-2
tests/e2e/run.py
···
83
83
raise TimeoutError(f"timed out waiting for {host}:{port}")
84
84
85
85
86
-
def wait_for_nixie(proc, timeout):
86
+
def wait_for_nixie(proc, log_path, timeout):
87
87
deadline = time.time() + timeout
88
88
while time.time() < deadline:
89
89
rc = proc.poll()
···
91
91
if rc != 0:
92
92
raise RuntimeError(f"nixie exited with status {rc}")
93
93
return
94
+
95
+
if log_path.exists():
96
+
log_text = log_path.read_text(encoding="utf-8", errors="replace")
97
+
if "failed to install NixOS" in log_text:
98
+
raise RuntimeError("nixie reported an installation failure")
99
+
94
100
time.sleep(5)
95
101
raise TimeoutError("timed out waiting for nixie to finish installing all hosts")
96
102
···
214
220
(nixie.outPath + "/examples/configuration.nix")
215
221
{{
216
222
networking.hostName = hostName;
223
+
disko.devices.disk.main.device = "/dev/vda";
217
224
}}
218
225
e2eModule
219
226
keyModule
···
376
383
qemu_proc, qemu_handle = start_process(machine["name"], cmd, qemu_log)
377
384
processes.append((qemu_proc, qemu_handle))
378
385
379
-
wait_for_nixie(nixie_proc, timeout=7200)
386
+
wait_for_nixie(nixie_proc, nixie_log, timeout=7200)
380
387
381
388
for machine in MACHINES:
382
389
wait_for_ssh(key_path, machine["ip"], machine["name"], timeout=1800)