Make Hydra evaluation work properly

This commit is contained in:
Sander van der Burg 2021-04-22 21:37:40 +02:00 committed by Sander van der Burg
parent 8a5a230f4c
commit b71661f420
3 changed files with 9 additions and 5 deletions

View File

@ -892,15 +892,17 @@ want to test for.
We can compose tests in the following Nix expression:
```nix
{ pkgs ? import <nixpkgs> { inherit system; }
{ nixpkgs ? <nixpkgs>
, system ? builtins.currentSystem
, processManagers ? [ "supervisord" "sysvinit" "systemd" "docker" "disnix" "s6-rc" ]
, profiles ? [ "privileged" "unprivileged" ]
}:
let
pkgs = import nixpkgs { inherit system; };
testService = import ../../nixproc/test-driver/universal.nix {
inherit system;
inherit nixpkgs system;
};
in
{

View File

@ -18,7 +18,7 @@ rec {
};
services = import ./tests/services {
inherit pkgs system;
inherit nixpkgs system;
};
multi-process-images = import ./tests/multi-process-images.nix {

View File

@ -1,12 +1,14 @@
{ pkgs ? import <nixpkgs> { inherit system; }
{ nixpkgs ? <nixpkgs>
, system ? builtins.currentSystem
, processManagers ? [ "supervisord" "sysvinit" "systemd" "docker" "disnix" "s6-rc" ]
, profiles ? [ "privileged" "unprivileged" ]
}:
let
pkgs = import nixpkgs { inherit system; };
testService = import ../../nixproc/test-driver/universal.nix {
inherit system;
inherit nixpkgs system;
};
in
{