[Bugfix] Make integration tests run after unit tests and timeout after 60 minutes (#997)

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

* call exec on launcher scripts

Co-authored-by: Timothy DeHerrera <[email protected]>

Author: dzajkowski

.buildkite/pipeline.nix

@@ -121,15 +121,6 @@ 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 ];
       label = "ETS";
@@ -145,6 +136,16 @@ in
       ];
     };
 
+    test-integration = commonAttrs // {
+      dependsOn = [ compile ];
+      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-Xmx6g -Dnix=true";
 }

src/universal/bin/eckeygen

@@ -2,4 +2,4 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR/..
-./bin/mantis -- eckeygen "$@"
+exec ./bin/mantis -- eckeygen "$@"

src/universal/bin/faucet-server

@@ -2,4 +2,4 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR/..
-./bin/mantis -Dconfig.file=./conf/faucet.conf "$@" -- faucet 
+exec ./bin/mantis -Dconfig.file=./conf/faucet.conf "$@" -- faucet

src/universal/bin/mantis-launcher

@@ -11,4 +11,4 @@ elif [ -z "$1" ]; then
   CHAIN_PARAM="-Dconfig.file=./conf/etc.conf"
 fi
 
-./bin/mantis ${CHAIN_PARAM:+"$CHAIN_PARAM"} "$@"
+exec ./bin/mantis ${CHAIN_PARAM:+"$CHAIN_PARAM"} "$@"

src/universal/bin/mantis-vm

@@ -3,4 +3,4 @@
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR/..
 
-./bin/mantis vm-server "$@"
+exec ./bin/mantis vm-server "$@"

src/universal/bin/signatureValidator

@@ -2,4 +2,4 @@
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 cd $DIR/..
-./bin/mantis -- signature-validator "$@"
+exec ./bin/mantis -- signature-validator "$@"