Commit 7472599d authored by Valentin Reis's avatar Valentin Reis
Browse files

singularity fix

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