movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-19 16:09:19 +03:00
Code Activity

nixos/nix-daemon: work on buildMachines submodule

Browse source
This commit is contained in:
Vincent Breitmoser 2020-03-21 20:21:58 +01:00
parent 1ed248eac2
commit 5395397fd6
1 changed files with 59 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

142
nixos/modules/services/misc/nix-daemon.nix
View file

@ -193,43 +193,60 @@ in
}; };
buildMachines = mkOption { buildMachines = mkOption {
type = types.loaOf (submodule ({ config }: { type = types.listOf (types.submodule ({
options = { options = {
sshUser = mkOption {
type = types.nullOr types.string;
default = null;
description = ''
The user as who to SSH to the build machine.
'';
};
hostName = mkOption { hostName = mkOption {
type = types.string; type = types.str;
example = "nixbuilder.example.org";
description = '' description = ''
The hostname of the build machine. The hostname of the build machine.
''; '';
}; };
system = mkOption { system = mkOption {
type = types.string; type = types.nullOr types.str;
default = null; default = null;
example = "x86_64-linux";
description = '' description = ''
The system type the build machine can execute derivations on. The system type the build machine can execute derivations on.
null if multiple are supported. Either this attribute or <varname>systems</varname> must be
present, where <varname>system</varname> takes precedence if
both are set.
''; '';
}; };
systems = mkOption { systems = mkOption {
type = types.listOf types.string; type = types.listOf types.str;
default = []; default = [];
example = [ "x86_64-linux" "aarch64-linux" ];
description = '' description = ''
The system types the build machine can execute derivations on. The system types the build machine can execute derivations on.
Either this attribute or <varname>system</varname> must be
present, where <varname>system</varname> takes precedence if
both are set.
'';
};
sshUser = mkOption {
type = types.nullOr types.str;
default = null;
example = "builder";
description = ''
The username to log in as on the remote host. This user must be
able to log in and run nix commands non-interactively. It must
also be privileged to build derivations, so must be included in
<option>nix.trustedUsers</option>.
''; '';
}; };
sshKey = mkOption { sshKey = mkOption {
type = types.string; type = types.nullOr types.str;
default = "-"; default = null;
example = "/root/.ssh/id_buildhost_builduser";
description = '' description = ''
The path to the SSH private key with which to authenticate with The path to the SSH private key with which to authenticate on
the build machine. <literal>"-"</literal> indicates falling back the build machine. The private key must not have a passphrase.
on defaults. If null, the building user (root on NixOS machines) must have an
appropriate ssh configuration to log in non-interactively.
Note that for security reasons, this path must point to a file
in the local filesystem, *not* to the nix store.
''; '';
}; };
maxJobs = mkOption { maxJobs = mkOption {
@ -237,7 +254,7 @@ in
default = 1; default = 1;
description = '' description = ''
The number of concurrent jobs the build machine supports. The The number of concurrent jobs the build machine supports. The
build machine will enforce its own limits but this allows hydra build machine will enforce its own limits, but this allows hydra
to schedule better since there is no work-stealing between build to schedule better since there is no work-stealing between build
machines. machines.
''; '';
@ -246,82 +263,41 @@ in
type = types.int; type = types.int;
default = 1; default = 1;
description = '' description = ''
Something at indicates how fast the machine is relative to an The relative speed of this builder. This is an arbitrary integer
arbitrary norm??? that indicates the speed of this builder, relative to other
builders. Higher is faster.
''; '';
}; };
mandatoryFeatures = mkOptions { mandatoryFeatures = mkOption {
type = types.listOf types.string; type = types.listOf types.str;
default = []; default = [];
decriptions = '' example = [ "big-parallel" ];
A list of features derivations built with this remote are description = ''
required to opt into using. (See the documentation on Nix itself A list of features mandatory for this builder. The builder will
for what those features are.) be ignored for derivations that don't require all features in
this list. All mandatory features are automatically included in
<varname>supportedFeatures</varname>.
''; '';
}; };
supportedFeatures = mkOptions { supportedFeatures = mkOption {
type = types.listOf types.string; type = types.listOf types.str;
default = []; default = [];
decriptions = '' example = [ "kvm" "big-parallel" ];
A list of features derivations built with this remote may choose description = ''
to use or not. (See the documentation on Nix itself for what A list of features supported by this builder. The builder will
those features are.) be ignored for derivations that require features not in this
list.
''; '';
}; };
}; };
config = {
assertions = [{
assertion = config.system != null || config.systems != null;
message = ''
At least one system type (via <varname>system</varname> or
<varname>systems</varname>) must be set for every build machine.
'';
}];
};
})); }));
default = []; default = [];
example = literalExample ''
[ { hostName = "voila.labs.cs.uu.nl";
sshUser = "nix";
sshKey = "/root/.ssh/id_buildfarm";
system = "powerpc-darwin";
maxJobs = 1;
}
{ hostName = "linux64.example.org";
sshUser = "buildfarm";
sshKey = "/root/.ssh/id_buildfarm";
system = "x86_64-linux";
maxJobs = 2;
speedFactor = 2;
supportedFeatures = [ "kvm" ];
mandatoryFeatures = [ "perf" ];
}
]
'';
description = '' description = ''
This option lists the machines to be used if distributed This option lists the machines to be used if distributed builds are
builds are enabled (see enabled (see <option>nix.distributedBuilds</option>).
<option>nix.distributedBuilds</option>). Nix will perform Nix will perform derivations on those machines via SSH by copying the
derivations on those machines via SSH by copying the inputs inputs to the Nix store on the remote machine, starting the build,
to the Nix store on the remote machine, starting the build, then copying the output back to the local Nix store.
then copying the output back to the local Nix store. Each
element of the list should be an attribute set containing
the machine's host name (<varname>hostname</varname>), the
user name to be used for the SSH connection
(<varname>sshUser</varname>), the Nix system type
(<varname>system</varname>, e.g.,
<literal>"i686-linux"</literal>), the maximum number of
jobs to be run in parallel on that machine
(<varname>maxJobs</varname>), the path to the SSH private
key to be used to connect (<varname>sshKey</varname>), a
list of supported features of the machine
(<varname>supportedFeatures</varname>) and a list of
mandatory features of the machine
(<varname>mandatoryFeatures</varname>). The SSH private key
should not have a passphrase, and the corresponding public
key should be added to
<filename>~<replaceable>sshUser</replaceable>/authorized_keys</filename>
on the remote machine.
''; '';
}; };
@ -548,7 +524,7 @@ in
concatMapStrings (machine: concatMapStrings (machine:
"${if machine.sshUser != null then "${machine.sshUser}@" else ""}${machine.hostName} " "${if machine.sshUser != null then "${machine.sshUser}@" else ""}${machine.hostName} "
+ (if machine.system != null then machine.system else concatStringsSep "," machine.systems) + (if machine.system != null then machine.system else concatStringsSep "," machine.systems)
+ " ${machine.sshKey} ${toString machine.maxJobs} " + " ${if machine.sshKey != null then machine.sshKey else "-"} ${toString machine.maxJobs} "
+ toString (machine.speedFactor) + toString (machine.speedFactor)
+ " " + " "
+ concatStringsSep "," (machine.mandatoryFeatures ++ machine.supportedFeatures) + concatStringsSep "," (machine.mandatoryFeatures ++ machine.supportedFeatures)