nixos/tests/incus: give tests unique names

This commit is contained in:
Adam C. Stephens
2025-09-29 21:36:24 -04:00
parent 1aa2d898d1
commit f25d94d9c0
3 changed files with 31 additions and 10 deletions

View File

@@ -19,6 +19,8 @@ let
in in
{ {
all = incusRunTest { all = incusRunTest {
name = "all";
appArmor = true;
feature.user = true; feature.user = true;
instances = { instances = {
@@ -41,20 +43,25 @@ in
}; };
}; };
# appArmor = incusRunTest {
# all = true;
# appArmor = true;
# };
container = incusRunTest { container = incusRunTest {
name = "container";
instances.c1 = { instances.c1 = {
type = "container"; type = "container";
}; };
}; };
lvm = incusRunTest { storage.lvm = true; }; lvm = incusRunTest {
name = "lvm";
openvswitch = incusRunTest { network.ovs = true; }; storage.lvm = true;
};
openvswitch = incusRunTest {
name = "openvswitch";
network.ovs = true;
};
ui = runTest { ui = runTest {
imports = [ ./ui.nix ]; imports = [ ./ui.nix ];
@@ -63,12 +70,14 @@ in
}; };
virtual-machine = incusRunTest { virtual-machine = incusRunTest {
name = "virtual-machine";
instances = { instances = {
vm1 = { vm1 = {
type = "virtual-machine"; type = "virtual-machine";
}; };
# TODO never becomes available # disabled because never becomes available
# csm = { # csm = {
# type = "virtual-machine"; # type = "virtual-machine";
# incusConfig.config = { # incusConfig.config = {
@@ -78,5 +87,9 @@ in
}; };
}; };
zfs = incusRunTest { storage.zfs = true; }; zfs = incusRunTest {
name = "zfs";
storage.zfs = true;
};
} }

View File

@@ -8,6 +8,11 @@ let
in in
{ {
options.tests.incus = { options.tests.incus = {
name = lib.mkOption {
type = lib.types.str;
description = "name appended to test";
};
package = lib.mkPackageOption pkgs "incus" { }; package = lib.mkPackageOption pkgs "incus" { };
preseed = lib.mkOption { preseed = lib.mkOption {

View File

@@ -15,12 +15,15 @@ let
) "" cfg.instances; ) "" cfg.instances;
in in
{ {
name = cfg.package.name; name = "${cfg.package.name}-${cfg.name}";
meta = { meta = {
maintainers = lib.teams.lxc.members; maintainers = lib.teams.lxc.members;
}; };
# sshBackdoor.enable = true;
# enableDebugHook = true;
nodes.server = { nodes.server = {
virtualisation = { virtualisation = {
cores = 2; cores = 2;