mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2025-02-16 23:27:17 +02:00
tests/nixos/remote-builds*: Inline module + format
This commit is contained in:
parent
e502d1cf94
commit
5167351efb
2 changed files with 149 additions and 151 deletions
|
@ -28,10 +28,6 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
name = lib.mkDefault "remote-builds-ssh-ng";
|
||||
|
||||
# TODO expand module shorthand syntax instead of use imports
|
||||
imports = [{
|
||||
options = {
|
||||
builders.config = lib.mkOption {
|
||||
type = lib.types.deferredModule;
|
||||
|
@ -41,7 +37,9 @@ in
|
|||
default = { };
|
||||
};
|
||||
};
|
||||
}];
|
||||
|
||||
config = {
|
||||
name = lib.mkDefault "remote-builds-ssh-ng";
|
||||
|
||||
nodes =
|
||||
{ builder =
|
||||
|
@ -120,4 +118,5 @@ in
|
|||
# Check that we get phase reporting in the log file
|
||||
client.succeed("grep -q '@nix {\"action\":\"setPhase\",\"phase\":\"buildPhase\"}' log-output")
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
@ -37,10 +37,6 @@ let
|
|||
in
|
||||
|
||||
{
|
||||
name = lib.mkDefault "remote-builds";
|
||||
|
||||
# TODO expand module shorthand syntax instead of use imports
|
||||
imports = [{
|
||||
options = {
|
||||
builders.config = lib.mkOption {
|
||||
type = lib.types.deferredModule;
|
||||
|
@ -50,7 +46,9 @@ in
|
|||
default = { };
|
||||
};
|
||||
};
|
||||
}];
|
||||
|
||||
config = {
|
||||
name = lib.mkDefault "remote-builds";
|
||||
|
||||
nodes =
|
||||
{ builder1 = builder;
|
||||
|
@ -123,4 +121,5 @@ in
|
|||
builder1.block()
|
||||
client.succeed("nix-build ${expr nodes.client 4}")
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue