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

nixos/tests/incus: give tests unique names

parent 1aa2d898

nixos/tests/incus/default.nix

+22 −9
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ let 
in

{

  all = incusRunTest {

    name = "all";

    appArmor = true;

    feature.user = true;



    instances = {
@@ -41,20 +43,25 @@ in 
    };

  };



  # appArmor = incusRunTest {

  #   all = true;

  #   appArmor = true;

  # };



  container = incusRunTest {

    name = "container";



    instances.c1 = {

      type = "container";

    };

  };



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

  lvm = incusRunTest {

    name = "lvm";



    storage.lvm = true;

  };



  openvswitch = incusRunTest {

    name = "openvswitch";



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

    network.ovs = true;

  };



  ui = runTest {

    imports = [ ./ui.nix ];
@@ -63,12 +70,14 @@ in 
  };



  virtual-machine = incusRunTest {

    name = "virtual-machine";



    instances = {

      vm1 = {

        type = "virtual-machine";

      };



      # TODO never becomes available

      # disabled because never becomes available

      # csm = {

      #   type = "virtual-machine";

      #   incusConfig.config = {
@@ -78,5 +87,9 @@ in 
    };

  };



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

  zfs = incusRunTest {

    name = "zfs";



    storage.zfs = true;

  };

}

nixos/tests/incus/incus-tests-module.nix

+5 −0
Original line number Diff line number Diff line
@@ -8,6 +8,11 @@ let 
in

{

  options.tests.incus = {

    name = lib.mkOption {

      type = lib.types.str;

      description = "name appended to test";

    };



    package = lib.mkPackageOption pkgs "incus" { };



    preseed = lib.mkOption {

nixos/tests/incus/incus-tests.nix

+4 −1
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@ let 
  ) "" cfg.instances;

in

{

  name = cfg.package.name;

  name = "${cfg.package.name}-${cfg.name}";



  meta = {

    maintainers = lib.teams.lxc.members;

  };



  # sshBackdoor.enable = true;

  # enableDebugHook = true;



  nodes.server = {

    virtualisation = {

      cores = 2;