diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-03-22 15:59:37 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-07-28 19:12:22 +0000 |
| commit | 5a5f8921458185ff1a11d27766f551290d4825ef (patch) | |
| tree | ca884844b68a90a5a9cf7ecea804561d1543d5bc /release/checks | |
| parent | f76b542bf129def2dbca7c99ef1cc2ec6386dd2f (diff) | |
| download | spectrum-5a5f8921458185ff1a11d27766f551290d4825ef.tar spectrum-5a5f8921458185ff1a11d27766f551290d4825ef.tar.gz spectrum-5a5f8921458185ff1a11d27766f551290d4825ef.tar.bz2 spectrum-5a5f8921458185ff1a11d27766f551290d4825ef.tar.lz spectrum-5a5f8921458185ff1a11d27766f551290d4825ef.tar.xz spectrum-5a5f8921458185ff1a11d27766f551290d4825ef.tar.zst spectrum-5a5f8921458185ff1a11d27766f551290d4825ef.zip | |
release/checks/wayland: also test cloud-hypervisor
Signed-off-by: Alyssa Ross <hi@alyssa.is>
Diffstat (limited to 'release/checks')
| -rw-r--r-- | release/checks/wayland/default.nix | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/release/checks/wayland/default.nix b/release/checks/wayland/default.nix index 9c18d18..8872f05 100644 --- a/release/checks/wayland/default.nix +++ b/release/checks/wayland/default.nix @@ -15,10 +15,17 @@ config.pkgs.nixosTest ({ pkgs, ... }: { nodes.machine = { ... }: { hardware.opengl.enable = true; + systemd.services.cloud-hypervisor = { + after = [ "crosvm-gpu.service" "weston.service" ]; + requires = [ "crosvm-gpu.service" "weston.service" ]; + serviceConfig.ExecStart = "${pkgs.cloud-hypervisor}/bin/cloud-hypervisor --memory shared=on --disk path=${appvm}/img/appvm/blk/root.img,readonly=on --disk path=${run}/blk/run.img,readonly=on --cmdline \"console=ttyS0 root=PARTLABEL=root\" --gpu socket=/run/crosvm-gpu.sock --serial tty --console null --kernel ${appvm}/img/appvm/vmlinux"; + }; + systemd.services.crosvm = { after = [ "crosvm-gpu.service" "weston.service" ]; requires = [ "crosvm-gpu.service" "weston.service" ]; - serviceConfig.ExecStart = "${pkgs.crosvm}/bin/crosvm run --disk ${appvm}/img/appvm/blk/root.img --disk ${run}/blk/run.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user-gpu /run/crosvm-gpu.sock --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; + serviceConfig.ExecStart = "${pkgs.crosvm}/bin/crosvm run -s /run/crosvm --disk ${appvm}/img/appvm/blk/root.img --disk ${run}/blk/run.img -p \"console=ttyS0 root=PARTLABEL=root\" --vhost-user-gpu /run/crosvm-gpu.sock --serial type=stdout,hardware=virtio-console,stdin=true ${appvm}/img/appvm/vmlinux"; + serviceConfig.ExecStop = "${pkgs.crosvm}/bin/crosvm stop /run/crosvm"; }; systemd.services.crosvm-gpu = { @@ -61,10 +68,14 @@ config.pkgs.nixosTest ({ pkgs, ... }: { machine.wait_for_unit('multi-user.target') machine.start_job('crosvm.service') - machine.wait_for_unit('surface-notify-socket.service'); machine.succeed('test "$(wc -c /run/surface-notify)" = "1 /run/surface-notify"', timeout=180) + machine.screenshot('crosvm') + machine.stop_job('crosvm-gpu.service') + machine.stop_job('crosvm.service') - machine.screenshot('weston') + machine.start_job('cloud-hypervisor.service') + machine.succeed('test "$(wc -c /run/surface-notify)" = "1 /run/surface-notify"', timeout=180) + machine.screenshot('cloud-hypervisor') ''; })) |