diff options
| author | Ryan Lahfa <masterancpp@gmail.com> | 2024-01-30 16:37:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 16:37:17 +0100 |
| commit | bed631549e4759ece200ac80bbd6fe2b65607640 (patch) | |
| tree | 909a1bf64db73a8dec646c7a3a92502e16f62fd5 /nixos/tests | |
| parent | 386c037cb771ac0303ed1edfdc89e7f018cb6b1d (diff) | |
| parent | 5d798a06571b77d1d5af82b920751aa6951a6c21 (diff) | |
| download | nixlib-bed631549e4759ece200ac80bbd6fe2b65607640.tar nixlib-bed631549e4759ece200ac80bbd6fe2b65607640.tar.gz nixlib-bed631549e4759ece200ac80bbd6fe2b65607640.tar.bz2 nixlib-bed631549e4759ece200ac80bbd6fe2b65607640.tar.lz nixlib-bed631549e4759ece200ac80bbd6fe2b65607640.tar.xz nixlib-bed631549e4759ece200ac80bbd6fe2b65607640.tar.zst nixlib-bed631549e4759ece200ac80bbd6fe2b65607640.zip | |
Merge pull request #284263 from amarshall/fix-zfs-test-wrong-pkg
nixos/tests/zfs: fix using wrong package in tests; minor cleanup
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/zfs.nix | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/nixos/tests/zfs.nix b/nixos/tests/zfs.nix index 8fedcf095af6..0b411b0b9d8a 100644 --- a/nixos/tests/zfs.nix +++ b/nixos/tests/zfs.nix @@ -8,12 +8,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; let makeZfsTest = name: - { kernelPackage ? if enableUnstable - then pkgs.zfsUnstable.latestCompatibleLinuxPackages - else pkgs.linuxPackages - , enableUnstable ? false + { kernelPackages , enableSystemdStage1 ? false - , zfsPackage ? if enableUnstable then pkgs.zfs else pkgs.zfsUnstable + , zfsPackage , extraTest ? "" }: makeTest { @@ -35,7 +32,7 @@ let boot.loader.timeout = 0; boot.loader.efi.canTouchEfiVariables = true; networking.hostId = "deadbeef"; - boot.kernelPackages = kernelPackage; + boot.kernelPackages = kernelPackages; boot.zfs.package = zfsPackage; boot.supportedFilesystems = [ "zfs" ]; boot.initrd.systemd.enable = enableSystemdStage1; @@ -197,16 +194,22 @@ in { # maintainer: @raitobezarius series_2_1 = makeZfsTest "2.1-series" { zfsPackage = pkgs.zfs_2_1; + kernelPackages = pkgs.linuxPackages; }; - stable = makeZfsTest "stable" { }; + stable = makeZfsTest "stable" { + zfsPackage = pkgs.zfsStable; + kernelPackages = pkgs.linuxPackages; + }; - unstable = makeZfsTest "unstable" { - enableUnstable = true; + unstable = makeZfsTest "unstable" rec { + zfsPackage = pkgs.zfsUnstable; + kernelPackages = zfsPackage.latestCompatibleLinuxPackages; }; - unstableWithSystemdStage1 = makeZfsTest "unstable" { - enableUnstable = true; + unstableWithSystemdStage1 = makeZfsTest "unstable" rec { + zfsPackage = pkgs.zfsUnstable; + kernelPackages = zfsPackage.latestCompatibleLinuxPackages; enableSystemdStage1 = true; }; |