Commit 9d6e26c2 authored by Valentin Reis's avatar Valentin Reis
Browse files

fixing the CI pipeline (dhrun fixes)

parent 1f58bc04
Pipeline #6541 passed with stages
in 10 minutes and 1 second
...@@ -121,7 +121,7 @@ in { hello = ...@@ -121,7 +121,7 @@ in { hello =
, cmdavoids = , cmdavoids =
[ "Traceback" ] [ "Traceback" ]
, timeout = , timeout =
[ 60 ] : Optional Natural [ 600 ] : Optional Natural
} }
) )
, listen = , listen =
...@@ -136,7 +136,7 @@ in { hello = ...@@ -136,7 +136,7 @@ in { hello =
, cmdavoids = , cmdavoids =
[ "Traceback" ] [ "Traceback" ]
, timeout = , timeout =
[ 60 ] : Optional Natural [ 600 ] : Optional Natural
} }
) )
[ lib.values.emptyCmd [ lib.values.emptyCmd
...@@ -153,7 +153,7 @@ in { hello = ...@@ -153,7 +153,7 @@ in { hello =
lib.appTest lib.appTest
( lib.emptyFilterTestArgs "power" "sleep" ( lib.emptyFilterTestArgs "power" "sleep"
⫽ { timeout = ⫽ { timeout =
[ 60 ] : Optional Natural [ 600 ] : Optional Natural
, args = , args =
[ "15" ] [ "15" ]
, isTest = , isTest =
...@@ -164,7 +164,7 @@ in { hello = ...@@ -164,7 +164,7 @@ in { hello =
lib.appTest lib.appTest
( lib.emptyFilterTestArgs "performance" "sleep" ( lib.emptyFilterTestArgs "performance" "sleep"
⫽ { timeout = ⫽ { timeout =
[ 60 ] : Optional Natural [ 600 ] : Optional Natural
, args = , args =
[ "15" ] [ "15" ]
, isTest = , isTest =
......
...@@ -137,7 +137,7 @@ in let makeBase = ...@@ -137,7 +137,7 @@ in let makeBase =
, outavoids = , outavoids =
args.cmdavoids args.cmdavoids
} }
in b in b
⫽ { args = ⫽ { args =
[ "run" [ "run"
...@@ -155,6 +155,8 @@ in let makeBase = ...@@ -155,6 +155,8 @@ in let makeBase =
] ]
, verbose = , verbose =
True True
, cleaning =
True
, workdir = , workdir =
"./_output" "./_output"
, pre = , pre =
...@@ -218,7 +220,7 @@ in let emptyFilterTestArgs = ...@@ -218,7 +220,7 @@ in let emptyFilterTestArgs =
in let appTest = in let appTest =
λ(args : FilterTestArgs) λ(args : FilterTestArgs)
→ let cn = "testContainer" → let cn = "testContainer"
in makeExtended in makeExtended
{ manifest = { manifest =
manifestDir ++ args.manifestname manifestDir ++ args.manifestname
...@@ -250,7 +252,7 @@ in let appTest = ...@@ -250,7 +252,7 @@ in let appTest =
, errfile = , errfile =
"nrmlisten.err" "nrmlisten.err"
} }
in b in b
⫽ { args = ⫽ { args =
[ "listen", "-u", cn, "--filter", args.filter ] [ "listen", "-u", cn, "--filter", args.filter ]
...@@ -260,9 +262,9 @@ in let appTest = ...@@ -260,9 +262,9 @@ in let appTest =
values.emptyCheck values.emptyCheck
⫽ { wants = ⫽ { wants =
if args.isTest if args.isTest
then [ args.filter ] then [ args.filter ]
else [] : List Text else [] : List Text
} }
} }
......
{ stdenv, src, autoreconfHook, fetchgit, pkgconfig, mpich2, excit, numabench}: { stdenv, src, autoreconfHook, fetchgit, pkgconfig, excit, numabench}:
stdenv.mkDerivation { stdenv.mkDerivation {
inherit src; inherit src;
name = "aml"; name = "aml";
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "127519c748491008c23d32144a2502a731b8866b", "rev": "63dee642647ccac45cada0fb86a2cda8324e6f11",
"sha256": "1nqlglvvvniy72s626qqc69h1g5yqrs6vkd2bzi11c5vqni368dm", "sha256": "1ia6qjczmwf2ka5wiin8710zb3yv312xdssfyyfcdyh4zb710pgg",
"url": "https://xgitlab.cels.anl.gov/argo/dhrun.git" "url": "https://xgitlab.cels.anl.gov/argo/dhrun.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"fetch": { "fetch": {
"args": { "args": {
"fetchSubmodules": false, "fetchSubmodules": false,
"rev": "7f3dd187765b1aac6f205a824de1c8bf80751336", "rev": "94dec2cd3709ba5205934d8af04508f2b8aeba70",
"sha256": "04hv4x6r3n33ii35fwyfs09l1d9qnr0pwb8lk84cq9lb5z1dlly8", "sha256": "0nqsf1dlmwyh0px1283a1xl38ncbj06wycqm9mhwb6dfh4s77al6",
"url": "https://xgitlab.cels.anl.gov/argo/nrm.git" "url": "https://xgitlab.cels.anl.gov/argo/nrm.git"
}, },
"fn": "fetchgit" "fn": "fetchgit"
......
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