summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-05-21 13:17:25 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-05-21 13:21:41 +0200
commit7808efe5b7c9abd89d3977825f7115f0a39a5771 (patch)
treebb310127ef3ef7e6985cf7383bad6e8ab8133ac8 /nixos
parent1f34503010bee487b36ed5256fa27e3d2d29c968 (diff)
downloadnixpkgs-7808efe5b7c9abd89d3977825f7115f0a39a5771.tar
nixpkgs-7808efe5b7c9abd89d3977825f7115f0a39a5771.tar.gz
nixpkgs-7808efe5b7c9abd89d3977825f7115f0a39a5771.tar.bz2
nixpkgs-7808efe5b7c9abd89d3977825f7115f0a39a5771.tar.lz
nixpkgs-7808efe5b7c9abd89d3977825f7115f0a39a5771.tar.xz
nixpkgs-7808efe5b7c9abd89d3977825f7115f0a39a5771.tar.zst
nixpkgs-7808efe5b7c9abd89d3977825f7115f0a39a5771.zip
nixos/release: Add luksroot test to "tested" job.
We want to avoid getting broken LUKS systems into the latest channel, so
let's ensure that the channel update won't happen if LUKS support is
broken again.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos')
-rw-r--r--nixos/release-combined.nix1
-rw-r--r--nixos/release.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index cb1c200ab47..a79f72823fd 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -53,6 +53,7 @@ in rec {
         (all nixos.tests.firewall)
         (all nixos.tests.gnome3)
         (all nixos.tests.installer.lvm)
+        (all nixos.tests.installer.luksroot)
         (all nixos.tests.installer.separateBoot)
         (all nixos.tests.installer.simple)
         (all nixos.tests.installer.simpleLabels)
diff --git a/nixos/release.nix b/nixos/release.nix
index 375b65d040e..dfc28173f1a 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -255,6 +255,7 @@ in rec {
   tests.i3wm = callTest tests/i3wm.nix {};
   tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test);
   tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test);
+  tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test);
   tests.installer.rebuildCD = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).rebuildCD.test);
   tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test);
   tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test);