From ad7773e86f1e1bb1f48b96e5126231fd060822e8 Mon Sep 17 00:00:00 2001 From: pk910 Date: Tue, 2 Apr 2024 09:04:53 +0200 Subject: [PATCH] fix: use `minimal-preset` images for dora & assertoor when minimal preset is used (#532) use `minimal-preset` images for dora & assertoor when minimal preset is used --- main.star | 3 +-- src/assertoor/assertoor_launcher.star | 2 ++ src/dora/dora_launcher.star | 16 ++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/main.star b/main.star index a318322ce..44b048d38 100644 --- a/main.star +++ b/main.star @@ -372,8 +372,7 @@ def run(plan, args={}): all_participants, args_with_right_defaults.participants, el_cl_data_files_artifact_uuid, - network_params.electra_fork_epoch, - network_params.network, + network_params, global_node_selectors, ) plan.print("Successfully launched dora") diff --git a/src/assertoor/assertoor_launcher.star b/src/assertoor/assertoor_launcher.star index df258e62f..14604d3ae 100644 --- a/src/assertoor/assertoor_launcher.star +++ b/src/assertoor/assertoor_launcher.star @@ -114,6 +114,8 @@ def get_config( if assertoor_params.image != "": IMAGE_NAME = assertoor_params.image + elif network_params.preset == "minimal": + IMAGE_NAME = "ethpandaops/assertoor:minimal-preset" else: IMAGE_NAME = "ethpandaops/assertoor:latest" diff --git a/src/dora/dora_launcher.star b/src/dora/dora_launcher.star index b5d97ac2d..4b39f9cdd 100644 --- a/src/dora/dora_launcher.star +++ b/src/dora/dora_launcher.star @@ -33,8 +33,7 @@ def launch_dora( participant_contexts, participant_configs, el_cl_data_files_artifact_uuid, - electra_fork_epoch, - network, + network_params, global_node_selectors, ): all_cl_client_info = [] @@ -50,7 +49,7 @@ def launch_dora( ) template_data = new_config_template_data( - network, HTTP_PORT_NUMBER, all_cl_client_info + network_params.network, HTTP_PORT_NUMBER, all_cl_client_info ) template_and_data = shared_utils.new_template_and_data( @@ -66,8 +65,7 @@ def launch_dora( config = get_config( config_files_artifact_name, el_cl_data_files_artifact_uuid, - electra_fork_epoch, - network, + network_params, global_node_selectors, ) @@ -77,8 +75,7 @@ def launch_dora( def get_config( config_files_artifact_name, el_cl_data_files_artifact_uuid, - electra_fork_epoch, - network, + network_params, node_selectors, ): config_file_path = shared_utils.path_join( @@ -86,7 +83,10 @@ def get_config( DORA_CONFIG_FILENAME, ) - IMAGE_NAME = "ethpandaops/dora:latest" + if network_params.preset == "minimal": + IMAGE_NAME = "ethpandaops/dora:minimal-preset" + else: + IMAGE_NAME = "ethpandaops/dora:latest" return ServiceConfig( image=IMAGE_NAME,