diff options
author | Robert Hensing <robert@roberthensing.nl> | 2018-09-27 17:03:23 +0200 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2018-11-13 10:43:05 +0100 |
commit | cdca66d7e8af90daa03fab564fa358df16b7421c (patch) | |
tree | 82e385f788319eb2ee53bf6e36b326eb97849132 /nixos/lib | |
parent | 9871fe3564ee6f4a5b4a77adaae62589dbcf60c2 (diff) |
Add pkgs.nixosTest
Diffstat (limited to 'nixos/lib')
-rw-r--r-- | nixos/lib/build-vms.nix | 14 | ||||
-rw-r--r-- | nixos/lib/testing.nix | 13 |
2 files changed, 22 insertions, 5 deletions
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 933f81392491c..024f4414ebeba 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -1,4 +1,13 @@ -{ system, pkgs, minimal ? false, config ? {} }: +{ system +, # Use a minimal kernel? + minimal ? false +, # Ignored + config ? null + # Nixpkgs, for qemu, lib and more +, pkgs +, # NixOS configuration to add to the VMs + extraConfigurations ? [] +}: with pkgs.lib; with import ../lib/qemu-flags.nix { inherit pkgs; }; @@ -28,7 +37,8 @@ rec { ../modules/testing/test-instrumentation.nix # !!! should only get added for automated test runs { key = "no-manual"; documentation.nixos.enable = false; } { key = "qemu"; system.build.qemu = qemu; } - ] ++ optional minimal ../modules/testing/minimal-kernel.nix; + ] ++ optional minimal ../modules/testing/minimal-kernel.nix + ++ extraConfigurations; extraArgs = { inherit nodes; }; }; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index f90fc9f7df0e5..690f7dfd5fac1 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -1,6 +1,13 @@ -{ system, pkgs, minimal ? false, config ? {} }: - -with import ./build-vms.nix { inherit system pkgs minimal config; }; +{ system +, pkgs + # Use a minimal kernel? +, minimal ? false + # Ignored +, config ? null + # Modules to add to each VM +, extraConfigurations ? [] }: + +with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; with pkgs; let |