...
 
Commits (1)
......@@ -88,7 +88,7 @@ in
--name ${cfg.name} \
--executor "shell" \
--maximum-timeout 1800 \
--tag-list "integration,notknl"\
--tag-list "integration,notknl,singularity"\
'';
ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \
--working-directory ${cfg.workDir} \
......
......@@ -241,6 +241,8 @@
Optional Natural
, powercap :
Powercap
, singularity :
Bool
}
let emptyFilterTestArgs =
......@@ -264,6 +266,8 @@
False
, timeout =
[] : Optional Natural
, singularity =
False
, powercap =
< NoCap = {=} | Cap : Text >
}
......@@ -291,7 +295,7 @@
, verbose =
True
, singularity =
False
args.singularity
, cmdwants =
[] : List Text
, cmdavoids =
......@@ -354,6 +358,8 @@
Optional Natural
, powercap :
Powercap
, singularity :
Bool
}
let emptyProgressAppTestArg =
......@@ -375,6 +381,8 @@
[] : Optional Natural
, powercap =
< NoCap = {=} | Cap : Text >
, singularity =
False
}
: ProgressAppTestArg
......@@ -385,7 +393,7 @@
⫽ { args =
args.args
, manifestname =
"basic.json"
if args.singularity then "singularity.json" else "basic.json"
, vars =
args.vars
, passvars =
......@@ -398,6 +406,8 @@
args.timeout
, powercap =
args.powercap
, singularity =
args.singularity
}
)
......
......@@ -60,6 +60,11 @@ testSTREAM:
script:
- "argonix build testSTREAM --argopkgs $ARGOPKGS $EXTRA --verbose"
testSTREAMSingularity:
extends: .applications
script:
- "argonix build testSTREAMSingularity --argopkgs $ARGOPKGS $EXTRA --verbose"
testOpenMC:
extends: .applications
script:
......
......@@ -53,6 +53,6 @@ testPower:
testSingularity:
extends: .test
tags:
- notknl
- singularity
script:
- "argonix build testSingularity --argopkgs $ARGOPKGS $EXTRA --verbose"
......@@ -51,6 +51,7 @@ let
argopkgs = rec {
singularity = bleeding.singularity;
# library of nix expressions
argolib = import ../lib/utils.nix;
......@@ -442,12 +443,14 @@ let
'';
});
testGeneric = doDhrun genericTestName;
testSingularity = (doDhrun "run-singularity").overrideAttrs (o:{
addSingularityPath = drv : drv.overrideAttrs (o:{
buildPhase = "PATH=$PATH:/tmp/argonix/ " + o.buildPhase;
__noChroot = true; # the test needs OS singularity installation so we disable sanboxing here.
});
testGeneric = doDhrun genericTestName;
testSingularity = addSingularityPath (doDhrun "run-singularity");
doDhrunApp = app : doDhrun "${app} True < NoCap = {=} | Cap : Text >";
testSTREAM = addBI (doDhrunApp "stream") stream;
testAMG = addBI (doDhrunApp "amg") amg;
......@@ -456,6 +459,9 @@ let
testLAMMPS = addBI (doDhrunApp "lammps") lammps;
testQMCPack = addBI (doDhrunApp "qmcpack") qmcpack ;
testSTREAMSingularity = addSingularityPath
(addBI (doDhrunApp "stream-singularity") stream);
testAll = (doDhrun "hello").overrideAttrs
(old:{
buildInputs = old.buildInputs ++ [
......