Unverified Commit bed63154 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

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

nixos/tests/zfs: fix using wrong package in tests; minor cleanup
parents 386c037c 5d798a06

nixos/tests/zfs.nix

+14 −11
Original line number Diff line number Diff line
@@ -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;

  };