Commit 2d8a143f authored by pk910's avatar pk910 Committed by GitHub

feat: add support for custom assertoor images & use assertoor image with...

feat: add support for custom assertoor images & use assertoor image with verkle support for verkle chains (#483)
parent 01868fcb
...@@ -385,6 +385,10 @@ goomy_blob_params: ...@@ -385,6 +385,10 @@ goomy_blob_params:
# Configuration place for the assertoor testing tool - https:#github.com/ethpandaops/assertoor # Configuration place for the assertoor testing tool - https:#github.com/ethpandaops/assertoor
assertoor_params: assertoor_params:
# Assertoor docker image to use
# Leave blank to use the default image according to your network params
image: ""
# Check chain stability # Check chain stability
# This check monitors the chain and succeeds if: # This check monitors the chain and succeeds if:
# - all clients are synced # - all clients are synced
......
...@@ -390,6 +390,7 @@ def run(plan, args={}): ...@@ -390,6 +390,7 @@ def run(plan, args={}):
assertoor_config_template, assertoor_config_template,
all_participants, all_participants,
args_with_right_defaults.participants, args_with_right_defaults.participants,
network_params,
assertoor_params, assertoor_params,
) )
plan.print("Successfully launched assertoor") plan.print("Successfully launched assertoor")
......
...@@ -34,6 +34,7 @@ def launch_assertoor( ...@@ -34,6 +34,7 @@ def launch_assertoor(
config_template, config_template,
participant_contexts, participant_contexts,
participant_configs, participant_configs,
network_params,
assertoor_params, assertoor_params,
): ):
all_client_info = [] all_client_info = []
...@@ -88,18 +89,30 @@ def launch_assertoor( ...@@ -88,18 +89,30 @@ def launch_assertoor(
config = get_config( config = get_config(
config_files_artifact_name, config_files_artifact_name,
tests_config_artifacts_name, tests_config_artifacts_name,
network_params,
assertoor_params,
) )
plan.add_service(SERVICE_NAME, config) plan.add_service(SERVICE_NAME, config)
def get_config(config_files_artifact_name, tests_config_artifacts_name): def get_config(
config_files_artifact_name,
tests_config_artifacts_name,
network_params,
assertoor_params,
):
config_file_path = shared_utils.path_join( config_file_path = shared_utils.path_join(
ASSERTOOR_CONFIG_MOUNT_DIRPATH_ON_SERVICE, ASSERTOOR_CONFIG_MOUNT_DIRPATH_ON_SERVICE,
ASSERTOOR_CONFIG_FILENAME, ASSERTOOR_CONFIG_FILENAME,
) )
IMAGE_NAME = "ethpandaops/assertoor:master" if assertoor_params.image != "":
IMAGE_NAME = assertoor_params.image
elif network_params.electra_fork_epoch != None:
IMAGE_NAME = "ethpandaops/assertoor:verkle-support"
else:
IMAGE_NAME = "ethpandaops/assertoor:master"
return ServiceConfig( return ServiceConfig(
image=IMAGE_NAME, image=IMAGE_NAME,
......
...@@ -236,6 +236,7 @@ def input_parser(plan, input_args): ...@@ -236,6 +236,7 @@ def input_parser(plan, input_args):
goomy_blob_args=result["goomy_blob_params"]["goomy_blob_args"], goomy_blob_args=result["goomy_blob_params"]["goomy_blob_args"],
), ),
assertoor_params=struct( assertoor_params=struct(
image=result["assertoor_params"]["image"],
run_stability_check=result["assertoor_params"]["run_stability_check"], run_stability_check=result["assertoor_params"]["run_stability_check"],
run_block_proposal_check=result["assertoor_params"][ run_block_proposal_check=result["assertoor_params"][
"run_block_proposal_check" "run_block_proposal_check"
...@@ -614,6 +615,7 @@ def get_default_goomy_blob_params(): ...@@ -614,6 +615,7 @@ def get_default_goomy_blob_params():
def get_default_assertoor_params(): def get_default_assertoor_params():
return { return {
"image": "",
"run_stability_check": True, "run_stability_check": True,
"run_block_proposal_check": True, "run_block_proposal_check": True,
"run_lifecycle_test": False, "run_lifecycle_test": False,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment