Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
argopkgs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
argo
argopkgs
Commits
1cfade44
Commit
1cfade44
authored
Oct 31, 2018
by
Valentin Reis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes for Hydra on argo-phi2.
parent
fc6b282e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
28 additions
and
7 deletions
+28
-7
deployments/argo.nixops
deployments/argo.nixops
+0
-0
deployments/ci.nix
deployments/ci.nix
+5
-6
modules/module-list.nix
modules/module-list.nix
+1
-0
modules/ssh-config/default.nix
modules/ssh-config/default.nix
+16
-0
modules/ssh-config/ssh_config
modules/ssh-config/ssh_config
+5
-0
pkgs/default.nix
pkgs/default.nix
+1
-1
No files found.
deployments/argo.nixops
View file @
1cfade44
No preview for this file type
deployments/ci.nix
View file @
1cfade44
...
...
@@ -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
=
1
0
;
{
hostName
=
"
argo-phi2
"
;
maxJobs
=
4
0
;
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" }
...
...
modules/module-list.nix
View file @
1cfade44
[
./known-hosts
./root-access
./ssh-config
./provider-tacc
]
modules/ssh-config/default.nix
0 → 100644
View file @
1cfade44
{
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
);
};
};
}
modules/ssh-config/ssh_config
0 → 100644
View file @
1cfade44
Host argo-phi2
HostName localhost
Port 2210
User freux
IdentityFile /run/secrets/id_buildfarm
pkgs/default.nix
View file @
1cfade44
...
...
@@ -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
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment