workbench: forge-stress{,-plutus,newtracing} variants

zeme-wana · May 18, 2022 · 2ad607d · 2ad607d
1 parent 361cb2a
commit 2ad607d
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -56,11 +56,12 @@ cluster-shell-trace:     ARGS += --arg 'autoStartCluster' true --argstr 'autoSta
 cluster-shell-dev-trace: ARGS += --arg 'autoStartCluster' true --arg 'workbenchDevMode' true --argstr 'autoStartClusterArgs' '--trace --trace-workbench' ## Enter Nix shell, dev mode, start workbench cluster, with shell tracing
 fixed:                   PROFILE = fixed-${ERA}
 fixed:                   ARGS += --arg 'autoStartCluster' true
-forge-stress:            PROFILE = forge-stress-plutus-${ERA}
-forge-stress:            ARGS += --arg 'workbenchDevMode' true
+forge-stress:            PROFILE = forge-stress-${ERA}
+forge-stress-plutus:     PROFILE = forge-stress-plutus-${ERA}
+forge-stress-newtracing: PROFILE = forge-stress-newtracing-${ERA}
 quick:                   PROFILE = quick-${ERA}
-quick:                   ARGS += --arg 'workbenchDevMode' true
-shell-dev cluster-shell-dev cluster-shell-trace cluster-shell-dev-trace fixed forge-stress quick: shell
+forge-stress forge-stress-plutus forge-stress-newtracing quick: ARGS += --arg 'workbenchDevMode' true
+shell-dev cluster-shell-dev cluster-shell-trace cluster-shell-dev-trace fixed forge-stress forge-stress-plutus forge-stress-newtracing quick: shell
 
 test-smoke: smoke ## Build the 'workbench-smoke-test', same as the Hydra job
 smoke:

diff --git a/nix/workbench/profiles/variants.jq b/nix/workbench/profiles/variants.jq
@@ -3,6 +3,25 @@
 
 def genesis_profile_variants:
 
+  { scenario: "fixed-loaded"
+  , composition:
+    { n_singular_hosts:               2
+    , n_dense_hosts:                  0
+    }
+  , genesis:
+    { utxo:                           6000000
+    , delegators:                     1300000
+    , max_block_size:                 80000
+    , epoch_length:                   600
+    , parameter_k:                    3
+    }
+  , node:
+    { shutdown_on_slot_synced: 2400
+    }
+  , generator: { tps: 15 }
+  } as $forge_stress_base
+  |
+
   ## Baseline:
   [ { genesis: { utxo: 4000000, delegators: 1000000 } }
 
@@ -59,37 +78,22 @@ def genesis_profile_variants:
       }
     , generator: { tps: 10 }
     }
+
   , { name: "forge-stress"
-    , scenario: "fixed-loaded"
-    , composition:
-      { n_singular_hosts:               2
-      , n_dense_hosts:                  0
-      }
-    , genesis:
-      { utxo:                           6000000
-      , delegators:                     1300000
-      , max_block_size:                 80000
-      , epoch_length:                   600
-      , parameter_k:                    3
-      }
+    } * $forge_stress_base
+
+  , { name: "forge-stress-newtracing"
     , node:
-      { shutdown_on_slot_synced: 2400
+      { tracing_backend:                "trace-dispatcher"
       }
-    , generator: { tps: 15 }
-    }
+    } * $forge_stress_base
+
   , { name: "forge-stress-plutus"
-    , scenario: "fixed-loaded"
     , composition:
       { n_singular_hosts:               1
-      , n_dense_hosts:                  0
       }
     , genesis:
-      { utxo:                           6000000
-      , delegators:                     1300000
-      , max_block_size:                 80000
-      , epoch_length:                   600
-      , parameter_k:                    3
-      , alonzo:
+      { alonzo:
         { maxTxExUnits:
           { exUnitsMem:                 12500000
           }
@@ -102,10 +106,8 @@ def genesis_profile_variants:
       , plutusMode:                     true
       , plutusAutoMode:                 true
       }
-    , node:
-      { shutdown_on_slot_synced:        2400
-      }
-    }
+    } * $forge_stress_base
+
   , { name: "quick"
     , scenario: "fixed-loaded"
     , composition: