Commit a1d5d008 authored by Valentin Reis's avatar Valentin Reis

ci fix

parent 04e4f3d9
Pipeline #3684 canceled with stage
{
pkgs ? import ../pin.nix ../nixpkgs-18.03.json,
pkgs ? import ../pin.nix {jsonpath=../nixpkgs-18.03.json;}
}:
let
keys = [ (pkgs.lib.readFile keys/id_rsa_vrg.pub) ];
argopkgs = import ../pkgs {};
hydraSrc = builtins.fetchTarball https://github.com/nixos/hydra/archive/master.tar.gz;
in
{
network.description = "argo-ci";
network.enableRollback = false;
main =
{ nodes, config, ... }:
{ config, ... }:
{
imports = [
./providers/openstack-tacc.nix
......@@ -64,9 +63,9 @@ in
environment.etc = pkgs.lib.singleton {
target = "nix/id_buildfarm";
source = keys/id_buildfarm;
uid = config.ids.uids.hydra;
gid = config.ids.gids.hydra;
mode = "0440";
uid = config.users.users.hydra-queue-runner.uid;
gid = config.users.groups.hydra.gid;
mode = "0600";
};
nix = {
......@@ -74,7 +73,14 @@ in
nrBuildUsers = 30;
distributedBuilds = true;
buildMachines = [
{ hostName = "slave1"; maxJobs = 1; speedFactor = 1; sshKey = "/etc/nix/id_buildfarm"; sshUser = "root"; system = "x86_64-linux"; }
{ hostName = "129.114.111.114";
maxJobs = 10;
speedFactor = 1;
sshKey = "/etc/nix/id_buildfarm";
sshUser = "root";
systems = ["builtin" "x86_64-linux" "i686-linux"];
supportedFeatures = [ "nixos-test" "benchmark" ];
}
];
extraOptions = "auto-optimise-store = true";
};
......@@ -126,7 +132,7 @@ in
slave1 =
{ nodes, ... }:
{ ... }:
{
imports = [
./providers/openstack-tacc.nix
......@@ -175,11 +181,6 @@ in
options = ''--max-freed "$((32 * 1024**3 - 1024 * $(df -P -k /nix/store | tail -n 1 | ${pkgs.gawk}/bin/awk '{ print $4 }')))"'';
};
users.extraUsers.root.openssh.authorizedKeys.keys = pkgs.lib.singleton ''
command="nice -n20 nix-store --serve --write" ${pkgs.lib.readFile ./keys/id_buildfarm.pub}
'';
users.extraUsers.root.openssh.authorizedKeys.keys = [ (pkgs.lib.readFile ./keys/id_buildfarm.pub)];
};
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment