extract common vars

lotus-soup/baseline.go

@@ -117,6 +117,8 @@ func runBaselineClient(t *TestEnvironment) error {
 
 	t.SyncClient.MustSignalEntry(ctx, stateStopMining)
 
+	time.Sleep(10 * time.Second) // wait for metrics to be emitted
+
 	// TODO broadcast published content CIDs to other clients
 	// TODO select a random piece of content published by some other client and retrieve it
 

lotus-soup/compositions/composition-k8s-3-1.toml

@@ -0,0 +1,59 @@
+[metadata]
+  name = "lotus-soup"
+  author = ""
+
+[global]
+  plan = "lotus-soup"
+  case = "lotus-baseline"
+  total_instances = 5
+  builder = "docker:go"
+  runner = "cluster:k8s"
+
+[global.build_config]
+  push_registry=true
+  go_proxy_mode="remote"
+  go_proxy_url="http://localhost:8081"
+  registry_type="aws"
+
+[global.run.test_params]
+  clients = "3"
+  miners = "1"
+  genesis_timestamp_offset = "100000"
+  balance = "2000"
+  sectors = "10"
+
+[[groups]]
+  id = "bootstrapper"
+  [groups.resources]
+    memory = "512Mi"
+    cpu = "1000m"
+  [groups.instances]
+    count = 1
+    percentage = 0.0
+  [groups.run]
+    [groups.run.test_params]
+      role = "bootstrapper"
+
+[[groups]]
+  id = "miners"
+  [groups.resources]
+    memory = "4096Mi"
+    cpu = "1000m"
+  [groups.instances]
+    count = 1
+    percentage = 0.0
+  [groups.run]
+    [groups.run.test_params]
+      role = "miner"
+
+[[groups]]
+  id = "clients"
+  [groups.resources]
+    memory = "1024Mi"
+    cpu = "1000m"
+  [groups.instances]
+    count = 3
+    percentage = 0.0
+  [groups.run]
+    [groups.run.test_params]
+      role = "client"

lotus-soup/compositions/composition-k8s-3-2.toml

@@ -0,0 +1,59 @@
+[metadata]
+  name = "lotus-soup"
+  author = ""
+
+[global]
+  plan = "lotus-soup"
+  case = "lotus-baseline"
+  total_instances = 6
+  builder = "docker:go"
+  runner = "cluster:k8s"
+
+[global.build_config]
+  push_registry=true
+  go_proxy_mode="remote"
+  go_proxy_url="http://localhost:8081"
+  registry_type="aws"
+
+[global.run.test_params]
+  clients = "3"
+  miners = "2"
+  genesis_timestamp_offset = "100000"
+  balance = "2000"
+  sectors = "10"
+
+[[groups]]
+  id = "bootstrapper"
+  [groups.resources]
+    memory = "512Mi"
+    cpu = "1000m"
+  [groups.instances]
+    count = 1
+    percentage = 0.0
+  [groups.run]
+    [groups.run.test_params]
+      role = "bootstrapper"
+
+[[groups]]
+  id = "miners"
+  [groups.resources]
+    memory = "4096Mi"
+    cpu = "1000m"
+  [groups.instances]
+    count = 2
+    percentage = 0.0
+  [groups.run]
+    [groups.run.test_params]
+      role = "miner"
+
+[[groups]]
+  id = "clients"
+  [groups.resources]
+    memory = "1024Mi"
+    cpu = "1000m"
+  [groups.instances]
+    count = 3
+    percentage = 0.0
+  [groups.run]
+    [groups.run.test_params]
+      role = "client"

lotus-soup/compositions/composition-k8s.toml

@@ -15,6 +15,13 @@
   go_proxy_url="http://localhost:8081"
   registry_type="aws"
 
+[global.run.test_params]
+  clients = "1"
+  miners = "1"
+  genesis_timestamp_offset = "100000"
+  balance = "2000"
+  sectors = "10"
+
 [[groups]]
   id = "bootstrapper"
   [groups.resources]
@@ -26,10 +33,6 @@
   [groups.run]
     [groups.run.test_params]
       role = "bootstrapper"
-      clients = "1"
-      miners = "1"
-      balance = "2000"
-      sectors = "10"
 
 [[groups]]
   id = "miners"
@@ -42,10 +45,6 @@
   [groups.run]
     [groups.run.test_params]
       role = "miner"
-      clients = "1"
-      miners = "1"
-      balance = "2000"
-      sectors = "10"
 
 [[groups]]
   id = "clients"
@@ -58,7 +57,3 @@
   [groups.run]
     [groups.run.test_params]
       role = "client"
-      clients = "1"
-      miners = "1"
-      balance = "2000"
-      sectors = "10"

lotus-soup/manifest.toml

@@ -27,6 +27,8 @@ instances = { min = 1, max = 100, default = 5 }
   sectors = { type = "int", default = 1 }
   role = { type = "string" }
 
+  genesis_timestamp_offset = { type = "int", default = 0 }
+
   random_beacon_type = { type = "enum", default = "mock", options = ["mock", "local-drand", "external-drand"] }
 
   # Params relevant to drand nodes. drand nodes should have role="drand", and must all be

lotus-soup/node.go

@@ -51,7 +51,7 @@ import (
 )
 
 func init() {
-	logging.SetLogLevel("*", "WARN")
+	logging.SetLogLevel("*", "ERROR")
 
 	os.Setenv("BELLMAN_NO_GPU", "1")
 
@@ -176,7 +176,7 @@ func prepareBootstrapper(t *TestEnvironment) (*Node, error) {
 	genesisTemplate := genesis.Template{
 		Accounts:  genesisActors,
 		Miners:    genesisMiners,
-		Timestamp: uint64(time.Now().Unix() - 100000), // this needs to be in the past
+		Timestamp: uint64(time.Now().Unix()) - uint64(t.IntParam("genesis_timestamp_offset")), // this needs to be in the past
 	}
 
 	// dump the genesis block