nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-30 02:42:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixosTests.incus: add test with old and new init

Browse Source
This commit is contained in:
Maciej Krüger 2024-02-20 23:42:59 +01:00
parent 39b4c0d686
commit c607e70f70
No known key found for this signature in database
GPG Key ID: 0D948CE19CF49C5F
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/tests/incus/container.nix
View File

@ -1,11 +1,11 @@
import ../make-test-python.nix ({ pkgs, lib, ... } : import ../make-test-python.nix ({ pkgs, lib, extra ? {}, ... } :
let let
releases = import ../../release.nix { releases = import ../../release.nix {
configuration = { configuration = {
# Building documentation makes the test unnecessarily take a longer time: # Building documentation makes the test unnecessarily take a longer time:
documentation.enable = lib.mkForce false; documentation.enable = lib.mkForce false;
}; } // extra;
}; };
container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system}; container-image-metadata = releases.lxdContainerMeta.${pkgs.stdenv.hostPlatform.system};

6
nixos/tests/incus/default.nix
View File

@ -5,7 +5,11 @@
handleTestOn, handleTestOn,
}: }:
{ {
container = import ./container.nix { inherit system pkgs; }; container-old-init = import ./container.nix { inherit system pkgs; };
container-new-init = import ./container.nix { inherit system pkgs; extra = {
# Enable new systemd init
boot.initrd.systemd.enable = true;
}; };
lxd-to-incus = import ./lxd-to-incus.nix { inherit system pkgs; }; lxd-to-incus = import ./lxd-to-incus.nix { inherit system pkgs; };
preseed = import ./preseed.nix { inherit system pkgs; }; preseed = import ./preseed.nix { inherit system pkgs; };
socket-activated = import ./socket-activated.nix { inherit system pkgs; }; socket-activated = import ./socket-activated.nix { inherit system pkgs; };