Skip to content

Commit ad7773e

Browse files
authored
fix: use minimal-preset images for dora & assertoor when minimal preset is used (ethereum#532)
use `minimal-preset` images for dora & assertoor when minimal preset is used
1 parent 6f84e3d commit ad7773e

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

main.star

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -372,8 +372,7 @@ def run(plan, args={}):
372372
all_participants,
373373
args_with_right_defaults.participants,
374374
el_cl_data_files_artifact_uuid,
375-
network_params.electra_fork_epoch,
376-
network_params.network,
375+
network_params,
377376
global_node_selectors,
378377
)
379378
plan.print("Successfully launched dora")

src/assertoor/assertoor_launcher.star

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ def get_config(
114114

115115
if assertoor_params.image != "":
116116
IMAGE_NAME = assertoor_params.image
117+
elif network_params.preset == "minimal":
118+
IMAGE_NAME = "ethpandaops/assertoor:minimal-preset"
117119
else:
118120
IMAGE_NAME = "ethpandaops/assertoor:latest"
119121

src/dora/dora_launcher.star

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ def launch_dora(
3333
participant_contexts,
3434
participant_configs,
3535
el_cl_data_files_artifact_uuid,
36-
electra_fork_epoch,
37-
network,
36+
network_params,
3837
global_node_selectors,
3938
):
4039
all_cl_client_info = []
@@ -50,7 +49,7 @@ def launch_dora(
5049
)
5150

5251
template_data = new_config_template_data(
53-
network, HTTP_PORT_NUMBER, all_cl_client_info
52+
network_params.network, HTTP_PORT_NUMBER, all_cl_client_info
5453
)
5554

5655
template_and_data = shared_utils.new_template_and_data(
@@ -66,8 +65,7 @@ def launch_dora(
6665
config = get_config(
6766
config_files_artifact_name,
6867
el_cl_data_files_artifact_uuid,
69-
electra_fork_epoch,
70-
network,
68+
network_params,
7169
global_node_selectors,
7270
)
7371

@@ -77,16 +75,18 @@ def launch_dora(
7775
def get_config(
7876
config_files_artifact_name,
7977
el_cl_data_files_artifact_uuid,
80-
electra_fork_epoch,
81-
network,
78+
network_params,
8279
node_selectors,
8380
):
8481
config_file_path = shared_utils.path_join(
8582
DORA_CONFIG_MOUNT_DIRPATH_ON_SERVICE,
8683
DORA_CONFIG_FILENAME,
8784
)
8885

89-
IMAGE_NAME = "ethpandaops/dora:latest"
86+
if network_params.preset == "minimal":
87+
IMAGE_NAME = "ethpandaops/dora:minimal-preset"
88+
else:
89+
IMAGE_NAME = "ethpandaops/dora:latest"
9090

9191
return ServiceConfig(
9292
image=IMAGE_NAME,

0 commit comments

Comments
 (0)