yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'vm-tests' (#2558) from vm-tests into main

Browse Source
This commit is contained in:
clan-bot
2024-12-04 16:14:54 +00:00
parent 1511b14b3c 8b12578c13
commit 742b0c2c45
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/clan-cli/clan_cli/vms/qemu.py
View File

@@ -151,6 +151,7 @@ def qemu_command(
"-serial", "null", "-serial", "null",
"-chardev", "file,id=char0,path=/dev/stdout", "-chardev", "file,id=char0,path=/dev/stdout",
"-device", "virtconsole,chardev=char0,nr=0", "-device", "virtconsole,chardev=char0,nr=0",
"-monitor", "none",
]) ])
vsock_cid = None vsock_cid = None

8
pkgs/clan-cli/clan_cli/vms/run.py
View File

@@ -127,6 +127,7 @@ def start_vm(
env = os.environ.copy() env = os.environ.copy()
env.update(extra_env) env.update(extra_env)
cmd = nix_shell(packages, args) cmd = nix_shell(packages, args)
log.debug(f"Starting VM with command: {cmd}")
with subprocess.Popen( with subprocess.Popen(
cmd, env=env, stdout=stdout, stderr=stderr, stdin=stdin cmd, env=env, stdout=stdout, stderr=stderr, stdin=stdin
) as process: ) as process:
@@ -291,7 +292,12 @@ def spawn_vm(
start_waypipe(qemu_cmd.vsock_cid, f"[{vm.machine_name}] "), start_waypipe(qemu_cmd.vsock_cid, f"[{vm.machine_name}] "),
start_virtiofsd(virtiofsd_socket), start_virtiofsd(virtiofsd_socket),
start_vm( start_vm(
qemu_cmd.args, packages, extra_env, stdout=stdout, stderr=stderr qemu_cmd.args,
packages,
extra_env,
stdout=stdout,
stderr=stderr,
stdin=stdin,
) as process, ) as process,
): ):
qemu_vm = QemuVm(machine, process, socketdir) qemu_vm = QemuVm(machine, process, socketdir)

8
pkgs/clan-cli/tests/test_vars_deployment.py
View File

@@ -1,4 +1,5 @@
import json import json
import subprocess
from contextlib import ExitStack from contextlib import ExitStack
import pytest import pytest
@@ -99,10 +100,13 @@ def test_vm_deployment(
vm1_config = inspect_vm(machine=Machine("m1_machine", FlakeId(str(flake.path)))) vm1_config = inspect_vm(machine=Machine("m1_machine", FlakeId(str(flake.path))))
vm2_config = inspect_vm(machine=Machine("m2_machine", FlakeId(str(flake.path)))) vm2_config = inspect_vm(machine=Machine("m2_machine", FlakeId(str(flake.path))))
with ExitStack() as stack: with ExitStack() as stack:
vm1 = stack.enter_context(spawn_vm(vm1_config)) vm1 = stack.enter_context(spawn_vm(vm1_config, stdin=subprocess.DEVNULL))
vm2 = stack.enter_context(spawn_vm(vm2_config)) vm2 = stack.enter_context(spawn_vm(vm2_config, stdin=subprocess.DEVNULL))
qga_m1 = stack.enter_context(vm1.qga_connect()) qga_m1 = stack.enter_context(vm1.qga_connect())
qga_m2 = stack.enter_context(vm2.qga_connect()) qga_m2 = stack.enter_context(vm2.qga_connect())
# run these always succesfull commands to make sure all vms have started before continuing
qga_m1.run(["echo"])
qga_m2.run(["echo"])
# check my_secret is deployed # check my_secret is deployed
result = qga_m1.run(["cat", "/run/secrets/vars/m1_generator/my_secret"]) result = qga_m1.run(["cat", "/run/secrets/vars/m1_generator/my_secret"])
assert result.stdout == "hello\n" assert result.stdout == "hello\n"