Commit 8bf9b654 authored by Valentin Reis's avatar Valentin Reis
Browse files

reduce test builds to single app dependencies.

parent 55ce8757
Pipeline #5833 passed with stages
in 7 minutes and 14 seconds
...@@ -140,22 +140,6 @@ let ...@@ -140,22 +140,6 @@ let
zmqat = pkgs-old.haskellPackages.zmqat; zmqat = pkgs-old.haskellPackages.zmqat;
# ci/experimental environments # ci/experimental environments
testBuildInputs = [
# argotk runs mpiexec:
pkgs.mpich2
# argotk uses hwloc to choose CPU counts:
pkgs.hwloc
# these are needed for some reason:
pkgs.coreutils
pkgs.utillinux
pkgs.git
# argo tools
argotk
# argo components
containers
nrm
];
test = pkgs.stdenv.mkDerivation rec { test = pkgs.stdenv.mkDerivation rec {
name = "testEnv"; name = "testEnv";
...@@ -197,7 +181,7 @@ let ...@@ -197,7 +181,7 @@ let
testApplications = test.overrideAttrs (old:{ testApplications = test.overrideAttrs (old:{
name = "testEnv-with-applications"; name = "testEnv-with-applications";
buildInputs = testBuildInputs ++ [ buildInputs = old.buildInputs ++ [
lammps lammps
qmcpack qmcpack
openmc openmc
...@@ -207,7 +191,7 @@ let ...@@ -207,7 +191,7 @@ let
]; ];
}); });
expe = testApplications.overrideAttrs (old:{ powerexpe = testApplications.overrideAttrs (old:{
name = "power-experiments"; name = "power-experiments";
buildInputs = old.buildInputs ++ [ buildInputs = old.buildInputs ++ [
#debug tools #debug tools
...@@ -257,8 +241,8 @@ let ...@@ -257,8 +241,8 @@ let
report = analysis.overrideAttrs (old:{ report = analysis.overrideAttrs (old:{
buildPhase = '' buildPhase = ''
echo "analysis/zymakefolder.R ${expe}" echo "analysis/zymakefolder.R ${powerexpe}"
analysis/zymakefolder.R ${expe} analysis/zymakefolder.R ${powerexpe}
''; '';
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
...@@ -277,11 +261,11 @@ let ...@@ -277,11 +261,11 @@ let
testListen = doArgotk test "TestListen"; testListen = doArgotk test "TestListen";
testPerfwrapper = doArgotk test "TestPerfwrapper"; testPerfwrapper = doArgotk test "TestPerfwrapper";
testPower = doArgotk test "TestPower"; testPower = doArgotk test "TestPower";
testSTREAM = doArgotk testApplications "TestSTREAM"; testSTREAM = doArgotk (test.overrideAttrs (old:{buildInputs=old.buildInputs++[ stream ];})) "TestSTREAM";
testAMG = doArgotk testApplications "TestAMG"; testAMG = doArgotk (test.overrideAttrs (old:{buildInputs=old.buildInputs++[ amg ];})) "TestAMG";
testOpenMC = doArgotk testApplications "TestOpenMC"; testOpenMC = doArgotk (test.overrideAttrs (old:{buildInputs=old.buildInputs++[ openmc ];})) "TestOpenMC";
testLAMMPS = doArgotk testApplications "TestLAMMPS"; testLAMMPS = doArgotk (test.overrideAttrs (old:{buildInputs=old.buildInputs++[ lammps ];})) "TestLAMMPS";
testQMCPack = doArgotk testApplications "TestQMCPack"; testQMCPack = doArgotk (test.overrideAttrs (old:{buildInputs=old.buildInputs++[ qmcpack ];})) "TestQMCPack";
testAll = doArgotk test "tests"; testAll = doArgotk test "tests";
}; };
......
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