ehmry
/
nix-processmgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

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

2
release.nix
View File

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

6
tests/services/default.nix
View File

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