Commit a8155ecd authored by Victor Colombo's avatar Victor Colombo

Refactor exec command

parent d69ec4bb
...@@ -76,7 +76,8 @@ def generate_cl_genesis_data( ...@@ -76,7 +76,8 @@ def generate_cl_genesis_data(
(" && ").join(all_dirpath_creation_commands), (" && ").join(all_dirpath_creation_commands),
] ]
exec(launcher_service_id, dir_creation_cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE) dir_creation_cmd_result = exec(struct(service_id=launcher_service_id, command=dir_creation_cmd))
assert(dir_creation_cmd_result["code"], "==", SUCCESSFUL_EXEC_CMD_EXIT_CODE)
# Copy files to output # Copy files to output
...@@ -92,7 +93,8 @@ def generate_cl_genesis_data( ...@@ -92,7 +93,8 @@ def generate_cl_genesis_data(
filepath_on_generator, filepath_on_generator,
OUTPUT_DIRPATH_ON_GENERATOR, OUTPUT_DIRPATH_ON_GENERATOR,
] ]
exec(launcher_service_id, cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE) cmd_result = exec(struct(service_id=launcher_service_id, command=cmd))
assert(cmd_result["code"], "==", SUCCESSFUL_EXEC_CMD_EXIT_CODE)
# Generate files that need dynamic content # Generate files that need dynamic content
content_to_write_to_output_filename = { content_to_write_to_output_filename = {
...@@ -109,7 +111,8 @@ def generate_cl_genesis_data( ...@@ -109,7 +111,8 @@ def generate_cl_genesis_data(
destFilepath, destFilepath,
) )
] ]
exec(launcher_service_id, cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE) cmd_result = exec(struct(service_id=launcher_service_id, command=cmd))
assert(cmd_result["code"], "==", SUCCESSFUL_EXEC_CMD_EXIT_CODE)
cl_genesis_generation_cmd = [ cl_genesis_generation_cmd = [
...@@ -122,7 +125,8 @@ def generate_cl_genesis_data( ...@@ -122,7 +125,8 @@ def generate_cl_genesis_data(
"--state-output", shared_utils.path_join(OUTPUT_DIRPATH_ON_GENERATOR, GENESIS_STATE_FILENAME) "--state-output", shared_utils.path_join(OUTPUT_DIRPATH_ON_GENERATOR, GENESIS_STATE_FILENAME)
] ]
exec(launcher_service_id, cl_genesis_generation_cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE) genesis_generation_result = exec(struct(service_id=launcher_service_id, command=cl_genesis_generation_cmd))
assert(genesis_generation_result["code"], "==", SUCCESSFUL_EXEC_CMD_EXIT_CODE)
cl_genesis_data_artifact_uuid = store_service_files(launcher_service_id, OUTPUT_DIRPATH_ON_GENERATOR) cl_genesis_data_artifact_uuid = store_service_files(launcher_service_id, OUTPUT_DIRPATH_ON_GENERATOR)
......
...@@ -64,7 +64,8 @@ def generate_cl_validator_keystores( ...@@ -64,7 +64,8 @@ def generate_cl_validator_keystores(
command_str = " && ".join(all_sub_command_strs) command_str = " && ".join(all_sub_command_strs)
exec(service_id, ["sh", "-c", command_str], SUCCESSFUL_EXEC_CMD_EXIT_CODE) command_result = exec(struct(service_id=service_id, command=["sh", "-c", command_str]))
assert(command_result["code"], "==", SUCCESSFUL_EXEC_CMD_EXIT_CODE)
# Store outputs into files artifacts # Store outputs into files artifacts
keystore_files = [] keystore_files = []
...@@ -94,7 +95,8 @@ def generate_cl_validator_keystores( ...@@ -94,7 +95,8 @@ def generate_cl_validator_keystores(
PRYSM_PASSWORD_FILEPATH_ON_GENERATOR, PRYSM_PASSWORD_FILEPATH_ON_GENERATOR,
), ),
] ]
exec(service_id, write_prysm_password_file_cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE) write_prysm_password_file_cmd_result = exec(struct(service_id=service_id, command=write_prysm_password_file_cmd))
assert(write_prysm_password_file_cmd_result["code"], "==", SUCCESSFUL_EXEC_CMD_EXIT_CODE)
prysm_password_artifact_uuid = store_service_files(service_id, PRYSM_PASSWORD_FILEPATH_ON_GENERATOR) prysm_password_artifact_uuid = store_service_files(service_id, PRYSM_PASSWORD_FILEPATH_ON_GENERATOR)
......
...@@ -73,7 +73,8 @@ def generate_el_genesis_data( ...@@ -73,7 +73,8 @@ def generate_el_genesis_data(
] ]
exec(launcher_service_id, dir_creation_cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE) dir_creation_cmd_result = exec(struct(service_id=launcher_service_id, command=dir_creation_cmd))
assert(dir_creation_cmd_result["code"], "==", SUCCESSFUL_EXEC_CMD_EXIT_CODE)
genesis_config_filepath_on_generator = shared_utils.path_join(CONFIG_DIRPATH_ON_GENERATOR, GENESIS_CONFIG_FILENAME) genesis_config_filepath_on_generator = shared_utils.path_join(CONFIG_DIRPATH_ON_GENERATOR, GENESIS_CONFIG_FILENAME)
genesis_filename_to_relative_filepath_in_artifact = {} genesis_filename_to_relative_filepath_in_artifact = {}
...@@ -88,7 +89,9 @@ def generate_el_genesis_data( ...@@ -88,7 +89,9 @@ def generate_el_genesis_data(
" ".join(cmd) " ".join(cmd)
] ]
exec(launcher_service_id, cmd_to_execute, SUCCESSFUL_EXEC_CMD_EXIT_CODE) cmd_to_execute_result = exec(struct(service_id=launcher_service_id, command=cmd_to_execute))
assert(cmd_to_execute_result["code"], "==", SUCCESSFUL_EXEC_CMD_EXIT_CODE)
genesis_filename_to_relative_filepath_in_artifact[output_filename] = shared_utils.path_join( genesis_filename_to_relative_filepath_in_artifact[output_filename] = shared_utils.path_join(
shared_utils.path_base(OUTPUT_DIRPATH_ON_GENERATOR), shared_utils.path_base(OUTPUT_DIRPATH_ON_GENERATOR),
...@@ -105,7 +108,8 @@ def generate_el_genesis_data( ...@@ -105,7 +108,8 @@ def generate_el_genesis_data(
) )
] ]
exec(launcher_service_id, jwt_secret_generation_cmd, SUCCESSFUL_EXEC_CMD_EXIT_CODE) jwt_secret_generation_cmd_result = exec(struct(service_id=launcher_service_id, command=jwt_secret_generation_cmd))
assert(jwt_secret_generation_cmd_result["code"], "==", SUCCESSFUL_EXEC_CMD_EXIT_CODE)
elGenesisDataArtifactUuid = store_service_files(launcher_service_id, OUTPUT_DIRPATH_ON_GENERATOR) elGenesisDataArtifactUuid = store_service_files(launcher_service_id, OUTPUT_DIRPATH_ON_GENERATOR)
......
...@@ -19,7 +19,7 @@ def run_synchronous_testnet_verification(params, el_client_contexts, cl_client_c ...@@ -19,7 +19,7 @@ def run_synchronous_testnet_verification(params, el_client_contexts, cl_client_c
add_service(SERVICE_ID, config) add_service(SERVICE_ID, config)
command = get_cmd(params, el_client_contexts, cl_client_contexts, True) command = get_cmd(params, el_client_contexts, cl_client_contexts, True)
exec(SERVICE_ID, command) exec(struct(service_id=SERVICE_ID, command=command))
def get_cmd(params, el_client_contexts, cl_client_contexts, add_binary_name): def get_cmd(params, el_client_contexts, cl_client_contexts, add_binary_name):
......
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