commit 9e95bbbc344f6c5d628d7f0c55e82a426a26e9df · pyrox.dev/nixpkgs

+2 -2

nixos/tests/all-tests.nix

···

       468
       468
        
         iftop = handleTest ./iftop.nix {};

     

       469
       469
        
         immich = handleTest ./web-apps/immich.nix {};

     

       470
       470
        
         incron = handleTest ./incron.nix {};

     

       471
       471
       -
         incus = pkgs.recurseIntoAttrs (handleTest ./incus { lts = false; });

     

       472
       472
       -
         incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { });

     

       471
       471
       +
         incus = pkgs.recurseIntoAttrs (handleTest ./incus { lts = false; inherit system pkgs; });

     

       472
       472
       +
         incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });

     

       473
       473
        
         influxdb = handleTest ./influxdb.nix {};

     

       474
       474
        
         influxdb2 = handleTest ./influxdb2.nix {};

     

       475
       475
        
         initrd-network-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn {};

+15 -8

nixos/tests/incus/default.nix

···

       1
       1
        
       {

     

       2
       2
       +
         system ? builtins.currentSystem,

     

       3
       3
       +
         config ? { },

     

       4
       4
       +
         pkgs ? import ../../.. { inherit system config; },

     

       2
       5
        
         lts ? true,

     

       3
       6
        
         ...

     

       4
       7
        
       }:

     
···

       7
       10
        
       in

     

       8
       11
        
       {

     

       9
       12
        
         all = incusTest {

     

       10
       10
       -
           inherit lts;

     

       13
       13
       +
           inherit lts pkgs system;

     

       11
       14
        
           allTests = true;

     

       12
       15
        
         };

     

       13
       16
        
       

     

       14
       17
        
         container = incusTest {

     

       15
       15
       -
           inherit lts;

     

       18
       18
       +
           inherit lts pkgs system;

     

       16
       19
        
           instanceContainer = true;

     

       17
       20
        
         };

     

       18
       21
        
       

     

       19
       22
        
         lvm = incusTest {

     

       20
       20
       -
           inherit lts;

     

       23
       23
       +
           inherit lts pkgs system;

     

       21
       24
        
           storageLvm = true;

     

       22
       25
        
         };

     

       23
       26
        
       

     

       24
       24
       -
         lxd-to-incus = import ./lxd-to-incus.nix { };

     

       27
       27
       +
         lxd-to-incus = import ./lxd-to-incus.nix {

     

       28
       28
       +
           inherit lts pkgs system;

     

       29
       29
       +
         };

     

       25
       30
        
       

     

       26
       31
        
         openvswitch = incusTest {

     

       27
       27
       -
           inherit lts;

     

       32
       32
       +
           inherit lts pkgs system;

     

       28
       33
        
           networkOvs = true;

     

       29
       34
        
         };

     

       30
       35
        
       

     

       31
       31
       -
         ui = import ./ui.nix { };

     

       36
       36
       +
         ui = import ./ui.nix {

     

       37
       37
       +
           inherit lts pkgs system;

     

       38
       38
       +
         };

     

       32
       39
        
       

     

       33
       40
        
         virtual-machine = incusTest {

     

       34
       34
       -
           inherit lts;

     

       41
       41
       +
           inherit lts pkgs system;

     

       35
       42
        
           instanceVm = true;

     

       36
       43
        
         };

     

       37
       44
        
       

     

       38
       45
        
         zfs = incusTest {

     

       39
       39
       -
           inherit lts;

     

       46
       46
       +
           inherit lts pkgs system;

     

       40
       47
        
           storageLvm = true;

     

       41
       48
        
         };

     

       42
       49
        
       }

+1 -1

nixos/tests/incus/incus-tests.nix

···

       445
       445
        
                       machine.succeed("incus storage volume show lvm_pool test_fs")

     

       446
       446
        
                       machine.succeed("incus storage volume show lvm_pool test_vol")

     

       447
       447
        
       

     

       448
       448
       -
                       machine.succeed("incus create lvm1 --empty --storage zfs_pool")

     

       448
       448
       +
                       machine.succeed("incus create lvm1 --empty --storage lvm_pool")

     

       449
       449
        
                       machine.succeed("incus list lvm1")

     

       450
       450
        
                 '';

     

       451
       451
        
         }

+3 -3

nixos/tests/incus/lxd-to-incus.nix

···

       3
       3
        
         {

     

       4
       4
        
           pkgs,

     

       5
       5
        
           lib,

     

       6
       6
       -
           incus ? pkgs.incus-lts,

     

       6
       6
       +
           lts ? true,

     

       7
       7
        
           ...

     

       8
       8
        
         }:

     

       9
       9
        
       

     
···

       21
       21
        
           };

     

       22
       22
        
       

     

       23
       23
        
           nodes.machine =

     

       24
       24
       -
             { lib, ... }:

     

       24
       24
       +
             { ... }:

     

       25
       25
        
             {

     

       26
       26
        
               virtualisation = {

     

       27
       27
        
                 diskSize = 6144;

     
···

       72
       72
        
       

     

       73
       73
        
                 incus = {

     

       74
       74
        
                   enable = true;

     

       75
       75
       -
                   package = incus;

     

       75
       75
       +
                   package = if lts then pkgs.incus-lts else pkgs.incus;

     

       76
       76
        
                 };

     

       77
       77
        
               };

     

       78
       78
        
               networking.nftables.enable = true;

+2 -2

nixos/tests/incus/ui.nix

···

       2
       2
        
         {

     

       3
       3
        
           pkgs,

     

       4
       4
        
           lib,

     

       5
       5
       -
           incus ? pkgs.incus-lts,

     

       5
       5
       +
           lts ? true,

     

       6
       6
        
           ...

     

       7
       7
        
         }:

     

       8
       8
        
         {

     
···

       18
       18
        
               virtualisation = {

     

       19
       19
        
                 incus = {

     

       20
       20
        
                   enable = true;

     

       21
       21
       -
                   package = incus;

     

       21
       21
       +
                   package = if lts then pkgs.incus-lts else pkgs.incus;

     

       22
       22
        
                 };

     

       23
       23
        
                 incus.ui.enable = true;

     

       24
       24
        
               };