restructure configs

smartcontractkit · Sep 18, 2024 · a3adca5 · a3adca5
1 parent c9b4197
commit a3adca5
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 17 deletions.
diff --git a/integration-tests/testconfig/automation/automation.toml b/integration-tests/testconfig/automation/automation.toml
@@ -204,7 +204,7 @@ max_perform_data_size=5_000
 max_revert_data_size=5_000
 
 # load test specific overrides
-[Logging.Grafana]
+[Load.Logging.Grafana]
 base_url="https://grafana.ops.prod.cldev.sh"
 dashboard_url="/d/a4899f53-f709-430a-aec2-24f32198dcc9/chainlink-automation-v2-load-test"
 
@@ -298,4 +298,12 @@ max_perform_data_size=5_000
 max_revert_data_size=5_000
 
 [Load.Pyroscope]
-enabled=false
+enabled=false
+
+[Benchmark.Logging.Grafana]
+base_url="https://grafana.ops.prod.cldev.sh"
+dashboard_url="/d/Q8n6m1unz/chainlink-automation-benchmark-test"
+
+[Soak.Logging.Grafana]
+base_url="https://grafana.ops.prod.cldev.sh"
+dashboard_url="/d/Q8n6m1unz/chainlink-automation-benchmark-test"
diff --git a/...errides/benchmark/1000Upkeeps-1h-2_1.toml → ...errides/benchmark/1000Upkeeps-1h-2_1.toml b/...errides/benchmark/1000Upkeeps-1h-2_1.toml → ...errides/benchmark/1000Upkeeps-1h-2_1.toml
@@ -1,15 +1,14 @@
 [ChainlinkImage]
 version="latest"
 
-[Keeper.Common]
+[Benchmark.Automation.Benchmark]
 registry_to_test = "2_1"
 number_of_registries = 1
 number_of_nodes = 6
 number_of_upkeeps = 1000
 upkeep_gas_limit = 1500000
 check_gas_to_burn = 10000
 perform_gas_to_burn = 1000
-max_perform_gas = 5000000
 block_range = 3600
 block_interval = 60
 forces_single_tx_key = false

diff --git a/...errides/benchmark/1000Upkeeps-1h-2_3.toml → ...errides/benchmark/1000Upkeeps-1h-2_3.toml b/...errides/benchmark/1000Upkeeps-1h-2_3.toml → ...errides/benchmark/1000Upkeeps-1h-2_3.toml
@@ -1,15 +1,14 @@
 [ChainlinkImage]
 version="latest"
 
-[Keeper.Common]
+[Benchmark.Automation.Benchmark]
 registry_to_test = "2_3"
 number_of_registries = 1
 number_of_nodes = 6
 number_of_upkeeps = 1000
 upkeep_gas_limit = 1500000
 check_gas_to_burn = 10000
 perform_gas_to_burn = 1000
-max_perform_gas = 5000000
 block_range = 3600
 block_interval = 60
 forces_single_tx_key = false

diff --git a/...eper/overrides/soak/50Upkeeps-8h-2_1.toml → ...tion/overrides/soak/50Upkeeps-8h-2_1.toml b/...eper/overrides/soak/50Upkeeps-8h-2_1.toml → ...tion/overrides/soak/50Upkeeps-8h-2_1.toml
@@ -1,15 +1,14 @@
 [ChainlinkImage]
 version="latest"
 
-[Keeper.Common]
+[Benchmark.Automation.Soak]
 registry_to_test = "2_1"
 number_of_registries = 1
 number_of_nodes = 6
 number_of_upkeeps = 50
 upkeep_gas_limit = 1500000
 check_gas_to_burn = 10000
 perform_gas_to_burn = 1000
-max_perform_gas = 5000000
 block_range = 28800
 block_interval = 300
 forces_single_tx_key = false

diff --git a/...eper/overrides/soak/50Upkeeps-8h-2_3.toml → ...tion/overrides/soak/50Upkeeps-8h-2_3.toml b/...eper/overrides/soak/50Upkeeps-8h-2_3.toml → ...tion/overrides/soak/50Upkeeps-8h-2_3.toml
@@ -1,15 +1,14 @@
 [ChainlinkImage]
 version="latest"
 
-[Keeper.Common]
+[Benchmark.Automation.Soak]
 registry_to_test = "2_3"
 number_of_registries = 1
 number_of_nodes = 6
 number_of_upkeeps = 50
 upkeep_gas_limit = 1500000
 check_gas_to_burn = 10000
 perform_gas_to_burn = 1000
-max_perform_gas = 5000000
 block_range = 28800
 block_interval = 300
 forces_single_tx_key = false

diff --git a/integration-tests/testconfig/keeper/keeper.toml b/integration-tests/testconfig/keeper/keeper.toml
@@ -59,11 +59,6 @@ contract_call_interval = "4s"
 # keeper benchmark running on simulated network requires 100k per node
 root_key_funds_buffer = 1_000_000
 
-# benchmark test specific overrides
-[Logging.Grafana]
-base_url="https://grafana.ops.prod.cldev.sh"
-dashboard_url="/d/Q8n6m1unz/chainlink-automation-benchmark-test"
-
 [Benchmark.Keeper.Common]
 registry_to_test = "2_1"
 number_of_registries = 1
@@ -115,8 +110,6 @@ Mode = 'FixedPrice'
 LimitDefault = 5_000_000
 """
 
-# soak test specific overrides
-
 [Soak.Keeper.Common]
 registry_to_test = "2_1"
 number_of_registries = 1