add job for faucet web

input-output-hk · Nov 30, 2020 · 927c322 · 927c322
1 parent 598a0ce
commit 927c322
Show file tree

Hide file tree

Showing 6 changed files with 99 additions and 19 deletions.
diff --git a/clusters/mantis/testnet/default.nix b/clusters/mantis/testnet/default.nix
@@ -91,7 +91,7 @@ in {
           maxSize = 40;
           instanceType = "c5.2xlarge";
           associatePublicIP = true;
-          maxInstanceLifetime = 604800;
+          maxInstanceLifetime = 0;
           iam.role = cluster.iam.roles.client;
           iam.instanceProfile.role = cluster.iam.roles.client;
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -16,10 +16,9 @@
         "git+ssh://github.com/input-output-hk/midnight-automation?ref=etcm-99-mantis-agen";
       flake = false;
     };
-    mantis-explorer = {
-      url = "github:input-output-hk/mantis-explorer";
-      flake = false;
-    };
+    mantis-explorer.url = "github:input-output-hk/mantis-explorer";
+    mantis-faucet-web.url =
+      "github:input-output-hk/mantis-faucet-web/nix-build";
   };
 
   outputs = { self, nixpkgs, utils, ops-lib, bitte, ... }:

diff --git a/jobs/mantis-qa-fastsync.nix b/jobs/mantis-qa-fastsync.nix
@@ -1,4 +1,3 @@
-
 { mkNomadJob, lib, mantis, mantis-source, mantis-faucet, mantis-faucet-source
 , dockerImages }:
 let

diff --git a/jobs/mantis-qa-load.nix b/jobs/mantis-qa-load.nix
@@ -166,7 +166,7 @@ let
 
             checkRestart = {
               limit = 5;
-              grace = "300s";
+              grace = "400s";
               ignoreWarnings = false;
             };
           }];
@@ -197,10 +197,10 @@ let
         };
 
         restartPolicy = {
-          interval = "30m";
-          attempts = 10;
+          interval = "15m";
+          attempts = 5;
           delay = "1m";
-          mode = "fail";
+          mode = "delay";
         };
 
         env = { REQUIRED_PEER_COUNT = toString requiredPeerCount; };
@@ -256,7 +256,7 @@ let
 
       inherit count;
 
-      requiredPeerCount = builtins.length miners;
+      requiredPeerCount = 5;
 
       services."${name}-rpc" = {
         addressMode = "host";
@@ -307,7 +307,7 @@ let
             mantis.blockchains.testnet-internal-nomad.ecip1098-block-number = 0
             mantis.blockchains.testnet-internal-nomad.ecip1097-block-number = 0
           '';
-          changeMode = "restart";
+          changeMode = "noop";
           destination = "local/mantis.conf";
         }
         genesisJson
@@ -318,7 +318,7 @@ let
 
   miners = lib.forEach (lib.range 1 amountOfMiners) (num: {
     name = "mantis-${toString num}";
-    requiredPeerCount = num - 1;
+    requiredPeerCount = if num > 5 then 5 else num - 1;
     publicPort = 9000 + num; # routed through haproxy/ingress
   });
 

diff --git a/overlay.nix b/overlay.nix
@@ -313,8 +313,9 @@ in {
     tree
   ];
 
-  mantis-explorer =
-    final.callPackage (self.inputs.mantis-explorer + "/package.nix") { };
+  mantis-explorer = self.inputs.mantis-explorer.defaultPackage.${system};
+
+  mantis-faucet-web = self.inputs.mantis-faucet-web.defaultPackage.${system};
 
   nixosConfigurations =
     self.inputs.bitte.legacyPackages.${system}.mkNixosConfigurations