wip(ci): DO NOT MERGE

Author: jpraynaud

.github/workflows/ci.yml

@@ -294,13 +294,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        mode: ["std"]
+        mode: ["master-slave"]
         era: ${{ fromJSON(needs.build-ubuntu-X64.outputs.eras) }}
         next_era: [""]
         cardano_node_version: ["10.1.3", "10.1.4", "10.2.1"]
         hard_fork_latest_era_at_epoch: [0]
-        run_id: ["#1", "#2"]
-        extra_args: [""]
+        run_id: ["#1", "#2", "#3", "#4", "#5"]
+        extra_args:
+          [
+            "--number-of-aggregators=2 --use-relays --relay-signer-registration-mode=passthrough --relay-signature-registration-mode=p2p",
+          ]
 
         include:
           # Include a test for partial decentralization with master/slave signer registration and P2P signature registration

mithril-test-lab/mithril-end-to-end/src/main.rs

@@ -77,7 +77,7 @@ pub struct Args {
     cardano_hard_fork_latest_era_at_epoch: u16,
 
     /// Mithril run interval for nodes (in ms)
-    #[clap(long, default_value_t = 125)]
+    #[clap(long, default_value_t = 100)]
     mithril_run_interval: u32,
 
     /// Mithril era to run

mithril-test-lab/mithril-end-to-end/src/mithril/aggregator.rs

@@ -1,7 +1,7 @@
 use crate::utils::MithrilCommand;
 use crate::{
-    PoolNode, DEVNET_MAGIC_ID, ERA_MARKERS_SECRET_KEY, ERA_MARKERS_VERIFICATION_KEY,
-    GENESIS_SECRET_KEY, GENESIS_VERIFICATION_KEY,
+    PoolNode, RetryableDevnetError, DEVNET_MAGIC_ID, ERA_MARKERS_SECRET_KEY,
+    ERA_MARKERS_VERIFICATION_KEY, GENESIS_SECRET_KEY, GENESIS_VERIFICATION_KEY,
 };
 use anyhow::{anyhow, Context};
 use mithril_common::era::SupportedEra;
@@ -209,6 +209,7 @@ impl Aggregator {
                     anyhow!("`mithril-aggregator genesis bootstrap` was terminated with a signal")
                 }
             })
+            .map_err(|e| anyhow!(RetryableDevnetError(e.to_string())))
         }
     }