puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nixos/tests/remote-builds*: Format

Browse source 
nixpkgs-fmt
This commit is contained in:
Robert Hensing 2024-01-22 18:47:59 +01:00
parent 5167351efb
commit c4d7c4a848
2 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,8 @@ in
name = lib.mkDefault "remote-builds-ssh-ng"; name = lib.mkDefault "remote-builds-ssh-ng";
nodes = nodes =
{ builder = {
builder =
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = [ test.config.builders.config ]; imports = [ test.config.builders.config ];
@ -54,17 +55,18 @@ in
client = client =
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ nix.settings.max-jobs = 0; # force remote building {
nix.settings.max-jobs = 0; # force remote building
nix.distributedBuilds = true; nix.distributedBuilds = true;
nix.buildMachines = nix.buildMachines =
[ { hostName = "builder"; [{
hostName = "builder";
sshUser = "root"; sshUser = "root";
sshKey = "/root/.ssh/id_ed25519"; sshKey = "/root/.ssh/id_ed25519";
system = "i686-linux"; system = "i686-linux";
maxJobs = 1; maxJobs = 1;
protocol = "ssh-ng"; protocol = "ssh-ng";
} }];
];
virtualisation.writableStore = true; virtualisation.writableStore = true;
virtualisation.additionalPaths = [ config.system.build.extraUtils ]; virtualisation.additionalPaths = [ config.system.build.extraUtils ];
nix.settings.substituters = lib.mkForce [ ]; nix.settings.substituters = lib.mkForce [ ];

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

@ -51,21 +51,26 @@ in
name = lib.mkDefault "remote-builds"; name = lib.mkDefault "remote-builds";
nodes = nodes =
{ builder1 = builder; {
builder1 = builder;
builder2 = builder; builder2 = builder;
client = client =
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ nix.settings.max-jobs = 0; # force remote building {
nix.settings.max-jobs = 0; # force remote building
nix.distributedBuilds = true; nix.distributedBuilds = true;
nix.buildMachines = nix.buildMachines =
[ { hostName = "builder1"; [
{
hostName = "builder1";
sshUser = "root"; sshUser = "root";
sshKey = "/root/.ssh/id_ed25519"; sshKey = "/root/.ssh/id_ed25519";
system = "i686-linux"; system = "i686-linux";
maxJobs = 1; maxJobs = 1;
} }
{ hostName = "builder2"; {
hostName = "builder2";
sshUser = "root"; sshUser = "root";
sshKey = "/root/.ssh/id_ed25519"; sshKey = "/root/.ssh/id_ed25519";
system = "i686-linux"; system = "i686-linux";