about summary refs log tree commit diff
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-03-18 12:41:53 +0100
committeraszlig <aszlig@redmoonstudios.org>2015-03-18 12:41:53 +0100
commitf01f598916283c6d66232ecd7a93097c5c118932 (patch)
treefefe5fbc7578a55af9c8c3d2c84640e6324661a7
parentb73d9004052a90647647475ee46884b445e1f534 (diff)
tests: Integrate heinrich VM test from labernix.
Using "import ../machines" is a bit ugly here, so we might want to
integrate this into make-test.nix, but other than that it should work
nevertheless.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
-rw-r--r--release.nix1
-rw-r--r--tests/heinrich.nix (renamed from labernix/tests/heinrich.nix)2
2 files changed, 2 insertions, 1 deletions
diff --git a/release.nix b/release.nix
index 72442bba..12c8d3ef 100644
--- a/release.nix
+++ b/release.nix
@@ -10,6 +10,7 @@ in with pkgs.lib; with builtins; {
 
   tests = {
     i3 = import ./tests/i3.nix { inherit system; };
+    heinrich = import ./tests/heinrich.nix { inherit system; };
   };
 
   manual = let
diff --git a/labernix/tests/heinrich.nix b/tests/heinrich.nix
index c524835e..af64b844 100644
--- a/labernix/tests/heinrich.nix
+++ b/tests/heinrich.nix
@@ -11,7 +11,7 @@ import ./make-test.nix {
     };
   in {
     heinrich = {
-      imports = [ common ../machines/heinrich.nix ];
+      imports = [ common (import ../machines {}).labnet.heinrich.config ];
       virtualisation.vlans = [ 1 8 14 ];
       heinrich.internalInterface = "eth1";
       heinrich.externalInterface = "eth2";