Commit 1f27605e authored by Valentin Reis's avatar Valentin Reis
Browse files

dhrun fix

parent ef056add
Pipeline #6550 passed with stages
in 2 minutes and 44 seconds
...@@ -6,8 +6,6 @@ in let cn = "testContainer" ...@@ -6,8 +6,6 @@ in let cn = "testContainer"
in let basicManifest = lib.manifestDir ++ "basic.json" in let basicManifest = lib.manifestDir ++ "basic.json"
in let perfManifest = lib.manifestDir ++ "perfwrap.json"
in let argIfTest = in let argIfTest =
λ(isTest : Bool) λ(isTest : Bool)
→ { isTest = → { isTest =
...@@ -171,9 +169,10 @@ in { hello = ...@@ -171,9 +169,10 @@ in { hello =
[ "15" ] [ "15" ]
, isTest = , isTest =
True True
, manifestname =
"perfwrap.json"
} }
) )
⫽ { manifest = perfManifest }
, stream = , stream =
apps.stream True apps.stream True
, openmc = , openmc =
......
...@@ -226,9 +226,9 @@ in let appTest = ...@@ -226,9 +226,9 @@ in let appTest =
manifestDir manifestDir
++ ( if args.isTest ++ ( if args.isTest
then "basic.json" then args.manifestname
else args.manifestname else "parallel.json"
) )
, containerName = , containerName =
cn cn
......
...@@ -4,6 +4,11 @@ ...@@ -4,6 +4,11 @@
#Extra argonix arguments #Extra argonix arguments
#EXTRA #EXTRA
.test:
stage: test
tags:
- integration
.build: .build:
stage: build stage: build
tags: tags:
...@@ -13,3 +18,8 @@ dhrun: ...@@ -13,3 +18,8 @@ dhrun:
extends: .build extends: .build
script: script:
- "argonix build dhrun --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build dhrun --argopkgs $ARGOPKGS $EXTRA --verbose"
dhrun-tests:
extends: .test
script:
- "argonix build dhrun-tests --argopkgs $ARGOPKGS $EXTRA --verbose"
...@@ -131,6 +131,8 @@ let ...@@ -131,6 +131,8 @@ let
''; '';
}); });
dhrun-tests = dhrun.overrideAttrs (_:{doCheck=true;});
argonix = haskellPackages.argonix.overrideAttrs (old:{ argonix = haskellPackages.argonix.overrideAttrs (old:{
installPhase = old.installPhase + '' installPhase = old.installPhase + ''
mkdir -p $out/share/ mkdir -p $out/share/
......
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