diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 7016dac6863ad..e932f8ab686dc 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -468,8 +468,8 @@ in { iftop = handleTest ./iftop.nix {}; immich = handleTest ./web-apps/immich.nix {}; incron = handleTest ./incron.nix {}; - incus = pkgs.recurseIntoAttrs (handleTest ./incus { lts = false; }); - incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { }); + incus = pkgs.recurseIntoAttrs (handleTest ./incus { lts = false; inherit system pkgs; }); + incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; }); influxdb = handleTest ./influxdb.nix {}; influxdb2 = handleTest ./influxdb2.nix {}; initrd-network-openvpn = handleTestOn [ "x86_64-linux" "i686-linux" ] ./initrd-network-openvpn {}; diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix index 525b07ae29487..99a410f8ae5b8 100644 --- a/nixos/tests/incus/default.nix +++ b/nixos/tests/incus/default.nix @@ -1,4 +1,7 @@ { + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../../.. { inherit system config; }, lts ? true, ... }: @@ -7,36 +10,40 @@ let in { all = incusTest { - inherit lts; + inherit lts pkgs system; allTests = true; }; container = incusTest { - inherit lts; + inherit lts pkgs system; instanceContainer = true; }; lvm = incusTest { - inherit lts; + inherit lts pkgs system; storageLvm = true; }; - lxd-to-incus = import ./lxd-to-incus.nix { }; + lxd-to-incus = import ./lxd-to-incus.nix { + inherit lts pkgs system; + }; openvswitch = incusTest { - inherit lts; + inherit lts pkgs system; networkOvs = true; }; - ui = import ./ui.nix { }; + ui = import ./ui.nix { + inherit lts pkgs system; + }; virtual-machine = incusTest { - inherit lts; + inherit lts pkgs system; instanceVm = true; }; zfs = incusTest { - inherit lts; + inherit lts pkgs system; storageLvm = true; }; } diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix index fb45990582250..ee20139c21d84 100644 --- a/nixos/tests/incus/incus-tests.nix +++ b/nixos/tests/incus/incus-tests.nix @@ -445,7 +445,7 @@ import ../make-test-python.nix ( machine.succeed("incus storage volume show lvm_pool test_fs") machine.succeed("incus storage volume show lvm_pool test_vol") - machine.succeed("incus create lvm1 --empty --storage zfs_pool") + machine.succeed("incus create lvm1 --empty --storage lvm_pool") machine.succeed("incus list lvm1") ''; } diff --git a/nixos/tests/incus/lxd-to-incus.nix b/nixos/tests/incus/lxd-to-incus.nix index 66f78cbd33b40..db1ef4d5c6a46 100644 --- a/nixos/tests/incus/lxd-to-incus.nix +++ b/nixos/tests/incus/lxd-to-incus.nix @@ -3,7 +3,7 @@ import ../make-test-python.nix ( { pkgs, lib, - incus ? pkgs.incus-lts, + lts ? true, ... }: @@ -21,7 +21,7 @@ import ../make-test-python.nix ( }; nodes.machine = - { lib, ... }: + { ... }: { virtualisation = { diskSize = 6144; @@ -72,7 +72,7 @@ import ../make-test-python.nix ( incus = { enable = true; - package = incus; + package = if lts then pkgs.incus-lts else pkgs.incus; }; }; networking.nftables.enable = true; diff --git a/nixos/tests/incus/ui.nix b/nixos/tests/incus/ui.nix index 16cd31db02e9b..6ab9ad0dd7314 100644 --- a/nixos/tests/incus/ui.nix +++ b/nixos/tests/incus/ui.nix @@ -2,7 +2,7 @@ import ../make-test-python.nix ( { pkgs, lib, - incus ? pkgs.incus-lts, + lts ? true, ... }: { @@ -18,7 +18,7 @@ import ../make-test-python.nix ( virtualisation = { incus = { enable = true; - package = incus; + package = if lts then pkgs.incus-lts else pkgs.incus; }; incus.ui.enable = true; }; diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index 98fe4f2e7c5de..94b30f5d39b99 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,7 +1,7 @@ import ./generic.nix { - hash = "sha256-roPBHqy5toYF0X9mATl6QYb5GGlgPoGZYOC9vKpca88="; - version = "6.0.2"; - vendorHash = "sha256-TP1NaUpsHF54mWQDcHS4uabfRJWu3k51ANNPdA4k1Go="; + hash = "sha256-+W4imWem5iQ6nPVcoObc4COFxQVED0ppVd/YC+Nqtgw="; + version = "6.0.3"; + vendorHash = "sha256-ZUtWzbAjHij95khYx8lWYEpA8ITlMtKpObG5Vl7aE90="; patches = [ # qemu 9.1 compat, remove when added to LTS ./572afb06f66f83ca95efa1b9386fceeaa1c9e11b.patch