max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-25 23:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/nixos/remote-builds*: Inline module + format

Browse source
This commit is contained in:
Robert Hensing 2024-01-22 18:44:16 +01:00
parent e502d1cf94
commit 5167351efb
2 changed files with 149 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/nixos/remote-builds-ssh-ng.nix
View file

@ -28,10 +28,6 @@ let
in in
{ {
name = lib.mkDefault "remote-builds-ssh-ng";
# TODO expand module shorthand syntax instead of use imports
imports = [{
options = { options = {
builders.config = lib.mkOption { builders.config = lib.mkOption {
type = lib.types.deferredModule; type = lib.types.deferredModule;
@ -41,7 +37,9 @@ in
default = { }; default = { };
}; };
}; };
}];
config = {
name = lib.mkDefault "remote-builds-ssh-ng";
nodes = nodes =
{ builder = { builder =
@ -120,4 +118,5 @@ in
# Check that we get phase reporting in the log file # Check that we get phase reporting in the log file
client.succeed("grep -q '@nix {\"action\":\"setPhase\",\"phase\":\"buildPhase\"}' log-output") client.succeed("grep -q '@nix {\"action\":\"setPhase\",\"phase\":\"buildPhase\"}' log-output")
''; '';
};
} }

9
tests/nixos/remote-builds.nix
View file

@ -37,10 +37,6 @@ let
in in
{ {
name = lib.mkDefault "remote-builds";
# TODO expand module shorthand syntax instead of use imports
imports = [{
options = { options = {
builders.config = lib.mkOption { builders.config = lib.mkOption {
type = lib.types.deferredModule; type = lib.types.deferredModule;
@ -50,7 +46,9 @@ in
default = { }; default = { };
}; };
}; };
}];
config = {
name = lib.mkDefault "remote-builds";
nodes = nodes =
{ builder1 = builder; { builder1 = builder;
@ -123,4 +121,5 @@ in
builder1.block() builder1.block()
client.succeed("nix-build ${expr nodes.client 4}") client.succeed("nix-build ${expr nodes.client 4}")
''; '';
};
} }