Unverified Commit 1aa2d898 authored by Adam C. Stephens's avatar Adam C. Stephens
Browse files

nixos/tests/incus: fix lvm, zfs, ovs tests

parent 6aa913f0

nixos/tests/incus/default.nix

+34 −3
Original line number Diff line number Diff line
@@ -18,6 +18,29 @@ let 
    };

in

{

  all = incusRunTest {

    feature.user = true;



    instances = {

      c1 = {

        type = "container";

      };



      vm1 = {

        type = "virtual-machine";

      };

    };



    network = {

      ovs = true;

    };



    storage = {

      lvm = true;

      zfs = true;

    };

  };



  # appArmor = incusRunTest {

  #   all = true;

  #   appArmor = true;
@@ -29,9 +52,9 @@ in 
    };

  };



  # lvm = incusRunTest { storage.lvm = true; };

  #

  # openvswitch = incusRunTest { network.ovs = true; };

  lvm = incusRunTest { storage.lvm = true; };



  openvswitch = incusRunTest { network.ovs = true; };



  ui = runTest {

    imports = [ ./ui.nix ];
@@ -44,6 +67,14 @@ in 
      vm1 = {

        type = "virtual-machine";

      };



      # TODO never becomes available

      # csm = {

      #   type = "virtual-machine";

      #   incusConfig.config = {

      #     "security.csm" = true;

      #   };

      # };

    };

  };

nixos/tests/incus/incus-tests.nix

+0 −6
Original line number Diff line number Diff line
@@ -6,12 +6,6 @@ 
}:



# TODO aarch64 vm filter

# TODO CSM

# with subtest("incus-user allows users to create instances"):

#     server.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'")

#     server.succeed("su - testuser bash -c 'incus launch nixos instance2'")

#     server.wait_for_instance("instance2", "user-1000")

#

let

  cfg = config.tests.incus;