mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 11:10:03 +00:00
Code Issues Wiki Activity

Merge pull request #284263 from amarshall/fix-zfs-test-wrong-pkg

Browse source 
nixos/tests/zfs: fix using wrong package in tests; minor cleanup
This commit is contained in:
Ryan Lahfa 2024-01-30 16:37:17 +01:00 committed by GitHub
parent 386c037cb7 5d798a0657
commit bed631549e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
nixos/tests/zfs.nix
View file

@ -8,12 +8,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
let let
makeZfsTest = name: makeZfsTest = name:
{ kernelPackage ? if enableUnstable { kernelPackages
then pkgs.zfsUnstable.latestCompatibleLinuxPackages
else pkgs.linuxPackages
, enableUnstable ? false
, enableSystemdStage1 ? false , enableSystemdStage1 ? false
, zfsPackage ? if enableUnstable then pkgs.zfs else pkgs.zfsUnstable , zfsPackage
, extraTest ? "" , extraTest ? ""
}: }:
makeTest { makeTest {
@ -35,7 +32,7 @@ let
boot.loader.timeout = 0; boot.loader.timeout = 0;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.hostId = "deadbeef"; networking.hostId = "deadbeef";
boot.kernelPackages = kernelPackage; boot.kernelPackages = kernelPackages;
boot.zfs.package = zfsPackage; boot.zfs.package = zfsPackage;
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
boot.initrd.systemd.enable = enableSystemdStage1; boot.initrd.systemd.enable = enableSystemdStage1;
@ -197,16 +194,22 @@ in {
# maintainer: @raitobezarius # maintainer: @raitobezarius
series_2_1 = makeZfsTest "2.1-series" { series_2_1 = makeZfsTest "2.1-series" {
zfsPackage = pkgs.zfs_2_1; zfsPackage = pkgs.zfs_2_1;
kernelPackages = pkgs.linuxPackages;
}; };
stable = makeZfsTest "stable" { }; stable = makeZfsTest "stable" {
zfsPackage = pkgs.zfsStable;
unstable = makeZfsTest "unstable" { kernelPackages = pkgs.linuxPackages;
enableUnstable = true;
}; };
unstableWithSystemdStage1 = makeZfsTest "unstable" { unstable = makeZfsTest "unstable" rec {
enableUnstable = true; zfsPackage = pkgs.zfsUnstable;
kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
};
unstableWithSystemdStage1 = makeZfsTest "unstable" rec {
zfsPackage = pkgs.zfsUnstable;
kernelPackages = zfsPackage.latestCompatibleLinuxPackages;
enableSystemdStage1 = true; enableSystemdStage1 = true;
}; };