diff --git a/lib/build-vms.nix b/lib/build-vms.nix index 939c1ecc51c..39ae9b77cf3 100644 --- a/lib/build-vms.nix +++ b/lib/build-vms.nix @@ -1,6 +1,7 @@ { nixos ? ./.. , nixpkgs ? /etc/nixos/nixpkgs , services ? /etc/nixos/services +, system ? builtins.currentSystem }: let pkgs = import nixpkgs { config = {}; }; in @@ -55,7 +56,7 @@ rec { nodes: configuration: import "${nixos}/lib/eval-config.nix" { - inherit nixpkgs services; + inherit nixpkgs services system; modules = [ configuration ]; extraArgs = { inherit nodes; }; /* !!! bug in the module/option handling: this ignores the diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm index 0573293c2af..7b97ff1a65d 100644 --- a/lib/test-driver/Machine.pm +++ b/lib/test-driver/Machine.pm @@ -90,9 +90,11 @@ sub connect { $self->start; + my $try = 0; while (1) { last if -e ($self->{stateDir} . "/running"); sleep 1; + die ("VM " . $self->{name} . " timed out") if $try++ > 180; } while (1) { diff --git a/release.nix b/release.nix index f2dd8e8bcbe..4dbf798ec0c 100644 --- a/release.nix +++ b/release.nix @@ -103,6 +103,7 @@ let (import ./tests/subversion.nix { inherit nixpkgs services; + system = "i686-linux"; }).report; diff --git a/tests/subversion.nix b/tests/subversion.nix index e6f438b01f4..c9556137305 100644 --- a/tests/subversion.nix +++ b/tests/subversion.nix @@ -1,6 +1,7 @@ { nixos ? ./.. , nixpkgs ? /etc/nixos/nixpkgs , services ? /etc/nixos/services +, system ? builtins.currentSystem }: with import ../lib/build-vms.nix { inherit nixos nixpkgs services; };