[Bugfix] Make integration tests run after unit tests and timeout after 60 minutes

Author: dzajkowski

.buildkite/pipeline.nix

@@ -83,7 +83,7 @@ in
     };
 
     test-unit = commonAttrs // {
-      dependsOn = [ compile ];
+      dependsOn = [ compile test-bytes test-crypto test-rlp ];
       label = "unit tests";
       command = ''
         nix-shell --run '$SBT coverage test'
@@ -109,7 +109,7 @@ in
     };
 
     test-evm = commonAttrs // {
-      dependsOn = [ compile ];
+      dependsOn = [ compile test-unit ];
       label = "EVM tests";
       command = ''
         nix-shell --run '$SBT coverage evm:test'
@@ -121,17 +121,8 @@ in
       ];
     };
 
-    test-integration = commonAttrs // {
-      dependsOn = [ compile ];
-      label = "integration tests";
-      command = ''
-        nix-shell --run '$SBT coverageOff it:test'
-      '';
-      artifactPaths = [ "target/test-reports/**/*" ];
-    };
-
     test-ets = commonAttrs // {
-      dependsOn = [ compile ];
+      dependsOn = [ compile test-unit ];
       label = "ETS";
       command = ''
         nix-shell --run './test-ets.sh'
@@ -145,6 +136,16 @@ in
       ];
     };
 
+    test-integration = commonAttrs // {
+      dependsOn = [ compile test-ets test-evm test-unit ];
+      label = "integration tests";
+      command = ''
+        nix-shell --run '$SBT coverageOff it:test'
+      '';
+      artifactPaths = [ "target/test-reports/**/*" ];
+      timeoutInMinutes = 60;
+    };
+
     coverageReport = commonAttrs // {
       dependsOn = [ test-unit test-evm ];
       label = "coverage report";
@@ -154,7 +155,7 @@ in
     };
 
     additional = commonAttrs // {
-      dependsOn = [ compile ];
+      dependsOn = [ compile test-integration ];
       label = "additional compilation & dist";
       command = ''
         nix-shell --run '$SBT benchmark:compile dist'

.buildkite/shell.nix

@@ -21,5 +21,5 @@ with pkgs;
 mkShell {
   nativeBuildInputs = [ sbt solc lllc jdk8 protoc-wrapper retesteth netcat-gnu ];
   # SBT = "sbt -v -mem 2048 -J-Xmx4g -Dsbt.ivy.home=/cache/ivy2 -Dsbt.boot.directory=/cache/sbt -Dmaven.repo.local=/cache/maven -Dnix=true";
-  SBT = "sbt -v -mem 2048 -J-Xmx4g -Dnix=true";
+  SBT = "sbt -v -mem 2048 -J-Xmx3584m -Dnix=true";
 }

build.sbt

@@ -197,7 +197,7 @@ lazy val node = {
         libraryDependencies in Compile
       ),
       buildInfoPackage := "io.iohk.ethereum.utils",
-      fork in Test := true,
+      fork in Test := false,
       buildInfoOptions in Compile += BuildInfoOption.ToMap
     )
     .settings(commonSettings("mantis"): _*)