Commit 1cfade44 authored by Valentin Reis's avatar Valentin Reis

Fixes for Hydra on argo-phi2.

parent fc6b282e
No preview for this file type
......@@ -18,6 +18,7 @@ in
environment.argo.known-hosts.enable=true;
environment.argo.provider-tacc.enable=true;
environment.argo.root-access.enable=true;
environment.argo.ssh-config.enable=true;
environment.variables.TERM = "xterm";
......@@ -53,13 +54,12 @@ in
#systems = ["builtin" "x86_64-linux" "i686-linux"];
#supportedFeatures = [ "nixos-test" "benchmark" ];
#}
{ hostName = "localhost:2210";
maxJobs = 10;
{ hostName = "argo-phi2";
maxJobs = 40;
speedFactor = 1;
sshKey = "/run/secrets/id_buildfarm";
sshUser = "freux";
systems = ["builtin" "x86_64-linux" "i686-linux"];
supportedFeatures = [ "nixos-test" "benchmark" ];
supportedFeatures = [ "nixos-test" "benchmark" "icc" ];
}
];
extraOptions = "auto-optimise-store = true";
......@@ -70,6 +70,7 @@ in
text = ''
mkdir -p /run/secrets/
chown -R ${builtins.toString config.users.users.hydra-queue-runner.uid}:${builtins.toString config.users.groups.hydra.gid} /run/secrets
chmod 0600 /run/secrets/*
'';
deps = [];
};
......@@ -145,10 +146,8 @@ in
"yggdrasil": { "url" : "https://xgitlab.cels.anl.gov/argo/yggdrasil.git" },
"libnrm": { "url" : "https://xgitlab.cels.anl.gov/argo/libnrm.git" },
"progress-benchmarks": { "url" : "https://xgitlab.cels.anl.gov/argo/progress-benchmarks.git" },
"power-slurm": { "url" : "https://xgitlab.cels.anl.gov/argo/power-slurm.git" },
"umap": { "url" : "https://xgitlab.cels.anl.gov/argo/umap.git" },
"power-bandit": { "url" : "https://xgitlab.cels.anl.gov/argo/power-bandit.git" },
"yggdrasil-c": { "url" : "https://xgitlab.cels.anl.gov/argo/yggdrasil-c.git" },
"kernel": { "url" : "https://xgitlab.cels.anl.gov/argo/kernel.git" },
"util-linux": { "url" : "https://xgitlab.cels.anl.gov/argo/util-linux.git" },
"libmsr": { "url" : "https://github.com/LLNL/libmsr.git" }
......
[
./known-hosts
./root-access
./ssh-config
./provider-tacc
]
{ config, lib, pkgs, ... }:
with lib;
let
cfg=config.environment.argo.ssh-config;
in
{
options.environment.argo.ssh-config = {
enable = mkEnableOption "argo_knownhosts";
};
config = mkIf config.environment.argo.ssh-config.enable {
programs.ssh = {
extraConfig = (builtins.readFile ./ssh_config);
};
};
}
Host argo-phi2
HostName localhost
Port 2210
User freux
IdentityFile /run/secrets/id_buildfarm
......@@ -11,7 +11,7 @@
packagepins ? import ./pins.nix {inherit (pkgs) stdenv fetchgit fetchgitPrivate;}
}:
let
compiler_path = "/opt/intel/compilers_and_libraries_2017.1.132/linux/";
compiler_path = "/opt/intel/compilers_and_libraries_2017.1.132/linux";
callPackage = pkgs.lib.callPackageWith pkgs;
pythonPackages = pkgs.python27Packages;
in rec {
......
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