From a1166d6fdba321de6e4a7651709aecff213959b8 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Wed, 8 Jul 2020 14:50:07 +0200 Subject: [PATCH] consistent compositions --- lotus-soup/compositions/composition-drand-halt.toml | 6 +++--- lotus-soup/compositions/composition-k8s-10-3.toml | 9 ++++++--- lotus-soup/compositions/composition-k8s-3-1.toml | 9 ++++++--- lotus-soup/compositions/composition-k8s-3-2.toml | 9 ++++++--- lotus-soup/compositions/composition-k8s.toml | 9 ++++++--- lotus-soup/compositions/composition-local-drand.toml | 7 ++++++- lotus-soup/compositions/composition-natural.toml | 6 ++++++ .../compositions/composition-paych-stress.toml | 8 ++++---- .../composition-stress-test-concurrent-natural.toml | 8 ++++---- .../composition-stress-test-concurrent.toml | 8 ++++---- .../composition-stress-test-serial-natural.toml | 8 ++++---- .../compositions/composition-stress-test-serial.toml | 8 ++++---- lotus-soup/compositions/composition-tracer.toml | 6 ++++++ lotus-soup/compositions/composition.toml | 8 ++++---- .../stress-test-concurrent-natural-k8s.toml | 12 ++++++------ 15 files changed, 75 insertions(+), 46 deletions(-) diff --git a/lotus-soup/compositions/composition-drand-halt.toml b/lotus-soup/compositions/composition-drand-halt.toml index ddf22c4ef..ea9ef8cfc 100644 --- a/lotus-soup/compositions/composition-drand-halt.toml +++ b/lotus-soup/compositions/composition-drand-halt.toml @@ -12,12 +12,12 @@ [global.build] selectors = ["testground"] -[global.build_config] - enable_go_build_cache = true - [global.run_config] exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } +[global.build_config] + enable_go_build_cache = true + [global.run.test_params] clients = "1" miners = "1" diff --git a/lotus-soup/compositions/composition-k8s-10-3.toml b/lotus-soup/compositions/composition-k8s-10-3.toml index cb74ce9d4..5ca13fae7 100644 --- a/lotus-soup/compositions/composition-k8s-10-3.toml +++ b/lotus-soup/compositions/composition-k8s-10-3.toml @@ -9,15 +9,18 @@ builder = "docker:go" runner = "cluster:k8s" +[global.build] + selectors = ["testground"] + +[global.run_config] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + [global.build_config] push_registry=true go_proxy_mode="remote" go_proxy_url="http://localhost:8081" registry_type="aws" -[global.run_config] - exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } - [global.run.test_params] clients = "10" miners = "3" diff --git a/lotus-soup/compositions/composition-k8s-3-1.toml b/lotus-soup/compositions/composition-k8s-3-1.toml index b41f8994a..ae56d06a1 100644 --- a/lotus-soup/compositions/composition-k8s-3-1.toml +++ b/lotus-soup/compositions/composition-k8s-3-1.toml @@ -9,15 +9,18 @@ builder = "docker:go" runner = "cluster:k8s" +[global.build] + selectors = ["testground"] + +[global.run_config] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + [global.build_config] push_registry=true go_proxy_mode="remote" go_proxy_url="http://localhost:8081" registry_type="aws" -[global.run_config] - exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } - [global.run.test_params] clients = "3" miners = "1" diff --git a/lotus-soup/compositions/composition-k8s-3-2.toml b/lotus-soup/compositions/composition-k8s-3-2.toml index e000604be..a06e34ad0 100644 --- a/lotus-soup/compositions/composition-k8s-3-2.toml +++ b/lotus-soup/compositions/composition-k8s-3-2.toml @@ -9,15 +9,18 @@ builder = "docker:go" runner = "cluster:k8s" +[global.build] + selectors = ["testground"] + +[global.run_config] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + [global.build_config] push_registry=true go_proxy_mode="remote" go_proxy_url="http://localhost:8081" registry_type="aws" -[global.run_config] - exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } - [global.run.test_params] clients = "3" miners = "2" diff --git a/lotus-soup/compositions/composition-k8s.toml b/lotus-soup/compositions/composition-k8s.toml index 2681f829c..9eec1346b 100644 --- a/lotus-soup/compositions/composition-k8s.toml +++ b/lotus-soup/compositions/composition-k8s.toml @@ -9,15 +9,18 @@ builder = "docker:go" runner = "cluster:k8s" +[global.build] + selectors = ["testground"] + +[global.run_config] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + [global.build_config] push_registry=true go_proxy_mode="remote" go_proxy_url="http://localhost:8081" registry_type="aws" -[global.run_config] - exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } - [global.run.test_params] clients = "1" miners = "1" diff --git a/lotus-soup/compositions/composition-local-drand.toml b/lotus-soup/compositions/composition-local-drand.toml index 6f517010e..351df7d19 100644 --- a/lotus-soup/compositions/composition-local-drand.toml +++ b/lotus-soup/compositions/composition-local-drand.toml @@ -9,6 +9,12 @@ builder = "docker:go" runner = "local:docker" +[global.build] + selectors = ["testground"] + +[global.run_config] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + [global.build_config] enable_go_build_cache = true @@ -32,7 +38,6 @@ [groups.run.test_params] role = "bootstrapper" - [[groups]] id = "miners" [groups.resources] diff --git a/lotus-soup/compositions/composition-natural.toml b/lotus-soup/compositions/composition-natural.toml index 36e8908bd..e729155c8 100644 --- a/lotus-soup/compositions/composition-natural.toml +++ b/lotus-soup/compositions/composition-natural.toml @@ -9,6 +9,12 @@ builder = "docker:go" runner = "local:docker" +[global.build] + selectors = ["testground"] + +[global.run_config] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + [global.build_config] enable_go_build_cache = true diff --git a/lotus-soup/compositions/composition-paych-stress.toml b/lotus-soup/compositions/composition-paych-stress.toml index 5122a3e53..4f31d04ad 100644 --- a/lotus-soup/compositions/composition-paych-stress.toml +++ b/lotus-soup/compositions/composition-paych-stress.toml @@ -9,14 +9,14 @@ builder = "exec:go" runner = "local:exec" -[global.build_config] - enable_go_build_cache = true +[global.build] + selectors = ["testground"] [global.run_config] exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } -[global.build] - selectors = ["testground"] +[global.build_config] + enable_go_build_cache = true [global.run.test_params] clients = "2" diff --git a/lotus-soup/compositions/composition-stress-test-concurrent-natural.toml b/lotus-soup/compositions/composition-stress-test-concurrent-natural.toml index d17f3c639..a0661c726 100644 --- a/lotus-soup/compositions/composition-stress-test-concurrent-natural.toml +++ b/lotus-soup/compositions/composition-stress-test-concurrent-natural.toml @@ -9,14 +9,14 @@ builder = "docker:go" runner = "local:docker" -[global.build_config] - enable_go_build_cache = true - [global.build] selectors = ["testground"] [global.run_config] - exposed_ports = ["6060", "1234", "2345"] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + +[global.build_config] + enable_go_build_cache = true [global.run.test_params] clients = "3" diff --git a/lotus-soup/compositions/composition-stress-test-concurrent.toml b/lotus-soup/compositions/composition-stress-test-concurrent.toml index d1d5abc5d..aa6ef8b07 100644 --- a/lotus-soup/compositions/composition-stress-test-concurrent.toml +++ b/lotus-soup/compositions/composition-stress-test-concurrent.toml @@ -9,14 +9,14 @@ builder = "docker:go" runner = "local:docker" -[global.build_config] - enable_go_build_cache = true - [global.build] selectors = ["testground"] [global.run_config] - exposed_ports = ["6060", "1234", "2345"] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + +[global.build_config] + enable_go_build_cache = true [global.run.test_params] clients = "3" diff --git a/lotus-soup/compositions/composition-stress-test-serial-natural.toml b/lotus-soup/compositions/composition-stress-test-serial-natural.toml index 66efc0b21..5a878c681 100644 --- a/lotus-soup/compositions/composition-stress-test-serial-natural.toml +++ b/lotus-soup/compositions/composition-stress-test-serial-natural.toml @@ -9,14 +9,14 @@ builder = "docker:go" runner = "local:docker" -[global.build_config] - enable_go_build_cache = true - [global.build] selectors = ["testground"] [global.run_config] - exposed_ports = ["6060", "1234", "2345"] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + +[global.build_config] + enable_go_build_cache = true [global.run.test_params] clients = "3" diff --git a/lotus-soup/compositions/composition-stress-test-serial.toml b/lotus-soup/compositions/composition-stress-test-serial.toml index 2151517ae..dc97b2705 100644 --- a/lotus-soup/compositions/composition-stress-test-serial.toml +++ b/lotus-soup/compositions/composition-stress-test-serial.toml @@ -9,14 +9,14 @@ builder = "docker:go" runner = "local:docker" -[global.build_config] - enable_go_build_cache = true - [global.build] selectors = ["testground"] [global.run_config] - exposed_ports = ["6060", "1234", "2345"] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + +[global.build_config] + enable_go_build_cache = true [global.run.test_params] clients = "3" diff --git a/lotus-soup/compositions/composition-tracer.toml b/lotus-soup/compositions/composition-tracer.toml index af9207fb0..146aded35 100644 --- a/lotus-soup/compositions/composition-tracer.toml +++ b/lotus-soup/compositions/composition-tracer.toml @@ -9,6 +9,12 @@ builder = "docker:go" runner = "local:docker" +[global.build] + selectors = ["testground"] + +[global.run_config] + exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } + [global.build_config] enable_go_build_cache = true diff --git a/lotus-soup/compositions/composition.toml b/lotus-soup/compositions/composition.toml index 9ebdc4144..812697075 100644 --- a/lotus-soup/compositions/composition.toml +++ b/lotus-soup/compositions/composition.toml @@ -9,14 +9,14 @@ builder = "exec:go" runner = "local:exec" -[global.build_config] - enable_go_build_cache = true +[global.build] + selectors = ["testground"] [global.run_config] exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } -[global.build] - selectors = ["testground"] +[global.build_config] + enable_go_build_cache = true [global.run.test_params] clients = "3" diff --git a/lotus-soup/compositions/stress-test-concurrent-natural-k8s.toml b/lotus-soup/compositions/stress-test-concurrent-natural-k8s.toml index 91448f662..bc09366c7 100644 --- a/lotus-soup/compositions/stress-test-concurrent-natural-k8s.toml +++ b/lotus-soup/compositions/stress-test-concurrent-natural-k8s.toml @@ -9,18 +9,18 @@ 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.build] selectors = ["testground"] [global.run_config] exposed_ports = { pprof = "6060", node_rpc = "1234", miner_rpc = "2345" } +[global.build_config] + push_registry=true + go_proxy_mode="remote" + go_proxy_url="http://localhost:8081" + registry_type="aws" + [global.run.test_params] clients = "6" miners = "2"