diff options
| author | Luca Bruno <luca.bruno@immobiliare.it> | 2014-08-29 11:39:18 +0200 |
|---|---|---|
| committer | Luca Bruno <luca.bruno@immobiliare.it> | 2014-08-29 11:49:36 +0200 |
| commit | a34a0dfdc58f05d637bcec951dcfd9d02e3fcc73 (patch) | |
| tree | 585c7a85b183df077184936a888265d25650c6bb /nixos/release.nix | |
| parent | b8a546a13aff5807c12c4045cb9d6b8f89f9fb4a (diff) | |
Revert "nixos/release: Dynamically generate installer tests"
This reverts commit 5870ae613f42c99456dcbbc4df01abdce3c1f448. It makes it hard to comment out installer tests.
Diffstat (limited to 'nixos/release.nix')
| -rw-r--r-- | nixos/release.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixos/release.nix b/nixos/release.nix index e5a4e7337ab0a..0620b46d46ad4 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -222,11 +222,12 @@ in rec { tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; - tests.installer = with pkgs.lib; - let installer = import tests/installer.nix; in - flip mapAttrs (installer { }) (name: _: - forAllSystems (system: (installer { system = system; }).${name}.test) - ); + tests.installer.efi = forAllSystems (system: (import tests/installer.nix { inherit system; }).efi.test); + tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test); + tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test); + tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test); + tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test); + tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test); tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; |