Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
argo
argopkgs
Commits
52c61522
Commit
52c61522
authored
May 13, 2019
by
Valentin Reis
Browse files
adds a singularity test.
parent
f725b8c2
Pipeline
#7305
failed with stages
in 3 minutes and 36 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
dhrun/all-tests.dh
View file @
52c61522
...
...
@@ -6,6 +6,8 @@ let cn = "testContainer"
let basicManifest = lib.manifestDir ++ "basic.json"
let singularityManifest = lib.manifestDir ++ "singularity.json"
let argIfTest =
λ(isTest : Bool)
→ { isTest =
...
...
@@ -16,7 +18,24 @@ let argIfTest =
let Powercap = < Cap : Text | NoCap : {} >
in { run =
in { run-singularity =
lib.makeBase
( lib.emptyMakeBaseArg "echo" singularityManifest cn
⫽ { args =
[ message ]
, verbose =
True
, singularity =
True
, cmdwants =
[] : List Text
, cmdavoids =
[ "Traceback" ]
, timeout =
[ 600 ] : Optional Natural
}
)
, run =
lib.makeBase
( lib.emptyMakeBaseArg "echo" basicManifest cn
⫽ { args =
...
...
dhrun/lib.dh
View file @
52c61522
...
...
@@ -67,6 +67,8 @@ let MakeBaseArg =
List Text
, verbose :
Bool
, singularity :
Bool
, cmdwants :
List Text
, cmdavoids :
...
...
@@ -97,6 +99,8 @@ let emptyMakeBaseArg =
[] : List Text
, verbose =
True
, singularity =
False
, cmdwants =
[] : List Text
, cmdavoids =
...
...
@@ -116,6 +120,10 @@ let emptyMakeBaseArg =
let addVerbose = λ(v : Bool) → if v then [ "--verbose" ] else [] : List Text
let addSingularity =
λ(v : Bool)
→ if v then [ "--container-runtime", "singularity" ] else [] : List Text
let addPowercap =
λ(p : Powercap)
→ merge
...
...
@@ -142,6 +150,7 @@ let makeBase =
⫽ { args =
[ "--nrm_log", "./nrm_log" ]
# addVerbose args.verbose
# addSingularity args.singularity
# addPowercap args.powercap
, vars =
[ { varname =
...
...
@@ -269,6 +278,8 @@ let appTest =
args.args
, verbose =
True
, singularity =
False
, cmdwants =
[] : List Text
, cmdavoids =
...
...
dhrun/manifests/singularity.json
0 → 100644
View file @
52c61522
{
"acKind"
:
"ImageManifest"
,
"acVersion"
:
"0.6.0"
,
"name"
:
"test"
,
"app"
:
{
"isolators"
:
[
{
"name"
:
"argo/scheduler"
,
"value"
:
{
"policy"
:
"SCHED_OTHER"
,
"priority"
:
"0"
}
},
{
"name"
:
"argo/container"
,
"value"
:
{
"cpus"
:
"1"
,
"mems"
:
"1"
}
},
{
"name"
:
"argo/perfwrapper"
,
"value"
:
{
"enabled"
:
"0"
}
},
{
"name"
:
"argo/power"
,
"value"
:
{
"enabled"
:
"1"
,
"profile"
:
"1"
,
"policy"
:
"NONE"
,
"damper"
:
"1e9"
,
"slowdown"
:
"1.1"
}
},
{
"name"
:
"argo/monitoring"
,
"value"
:
{
"enabled"
:
"1"
,
"ratelimit"
:
"10000000"
}
},
{
"name"
:
"argo/hwbind"
,
"value"
:
{
"enabled"
:
"0"
}
}
]
},
"image"
:
{
"path"
:
"docker://ubuntu"
,
"type"
:
"docker"
}
}
pkgs/default.nix
View file @
52c61522
...
...
@@ -444,6 +444,9 @@ let
doDhrun
dhrunscript
;
testGeneric
=
doDhrunKey
genericTestName
;
testSingularity
=
(
doDhrunKey
"run-singularity"
)
.
overrideAttrs
(
o
:{
buildInputs
=
o
.
buildInputs
++
[
pkgs
.
singularity
];
});
testSTREAM
=
addBI
(
doDhrunApp
"stream"
)
stream
;
testAMG
=
addBI
(
doDhrunApp
"amg"
)
amg
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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