From 3bee54e3a6a4ee7f3565977e8c49a10383591f90 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Wed, 23 Jul 2025 14:36:51 +0200 Subject: [PATCH] Tezt/Cloud/DAL: rework daemon naming --- tezt/tests/cloud/agent_kind.ml | 25 +++++++++++++++++++++++++ tezt/tests/cloud/agent_kind.mli | 18 ++++++++++++++++++ tezt/tests/cloud/dal.ml | 4 ++-- tezt/tests/cloud/dal_node_helpers.ml | 9 +++++---- tezt/tests/cloud/echo_rollup.ml | 2 +- tezt/tests/cloud/etherlink_helpers.ml | 10 +++++----- 6 files changed, 56 insertions(+), 12 deletions(-) diff --git a/tezt/tests/cloud/agent_kind.ml b/tezt/tests/cloud/agent_kind.ml index b3cfa44811da..35d25cf97997 100644 --- a/tezt/tests/cloud/agent_kind.ml +++ b/tezt/tests/cloud/agent_kind.ml @@ -36,3 +36,28 @@ let name_of = function | Echo_rollup_operator -> "echo-rollup-operator" | Echo_rollup_dal_observer {slot_index} -> Format.sprintf "echo-rollup-dal-node-%d" slot_index + +type daemon = + | Baker_l1_node of int + | Baker_dal_node of int + | Producer_l1_node of int + | Producer_dal_node of int + | Observer_l1_node of int + | Observer_dal_node of int + | Echo_rollup_node of string + | Etherlink_sc_rollup_node of string + | Etherlink_evm_node of string + | Etherlink_producer_node of string + +let name_of_daemon = function + | Baker_l1_node i -> Format.asprintf "baker-node-%d" i + | Baker_dal_node i -> Format.asprintf "baker-dal-node-%d" i + | Producer_l1_node i -> Format.asprintf "producer-node-%i" i + | Producer_dal_node i -> Format.asprintf "producer-dal-node-%i" i + | Observer_l1_node i -> Format.asprintf "observer-node-%i" i + | Observer_dal_node i -> Format.asprintf "observer-dal-node-%i" i + | Echo_rollup_node name -> Format.asprintf "%s-rollup-node" name + | Etherlink_sc_rollup_node name -> + Format.asprintf "etherlink-%s-rollup-node" name + | Etherlink_evm_node name -> Format.asprintf "etherlink-%s-evm-node" name + | Etherlink_producer_node name -> Format.asprintf "etherlink-%s-node" name diff --git a/tezt/tests/cloud/agent_kind.mli b/tezt/tests/cloud/agent_kind.mli index 6c97b36aaf06..e82150a3d871 100644 --- a/tezt/tests/cloud/agent_kind.mli +++ b/tezt/tests/cloud/agent_kind.mli @@ -36,3 +36,21 @@ type t = (** [name_of agent] returns the standard name associated with a given [agent]. Used for consistent naming of VMs, logs and artifacts. *) val name_of : t -> string + +(** [daemon] stands for a binary that is running onto an agent. A [daemon] is + identified by a standard name that is used for consistent namings. *) +type daemon = + | Baker_l1_node of int + | Baker_dal_node of int + | Producer_l1_node of int + | Producer_dal_node of int + | Observer_l1_node of int + | Observer_dal_node of int + | Echo_rollup_node of string + | Etherlink_sc_rollup_node of string + | Etherlink_evm_node of string + | Etherlink_producer_node of string + +(** [name_of_daemon] returns the standard name associated with a given [daemon]. + Used for consistent naming of VMs, logs and artifacts. *) +val name_of_daemon : daemon -> string diff --git a/tezt/tests/cloud/dal.ml b/tezt/tests/cloud/dal.ml index 8dc152bae7ab..781451dc2340 100644 --- a/tezt/tests/cloud/dal.ml +++ b/tezt/tests/cloud/dal.ml @@ -2495,7 +2495,7 @@ let init_baker ?stake cloud (configuration : configuration) ~bootstrap teztale ?env ?data_dir ~arguments:Node.[Peer bootstrap.node_p2p_endpoint] - ~name:(Format.asprintf "baker-node-%d" i) + ~name:(name_of_daemon (Baker_l1_node i)) ~rpc_external:configuration.external_rpc configuration.network ~with_yes_crypto @@ -2509,7 +2509,7 @@ let init_baker ?stake cloud (configuration : configuration) ~bootstrap teztale else let* dal_node = Dal_node.Agent.create - ~name:(Format.asprintf "baker-dal-node-%d" i) + ~name:(name_of_daemon (Baker_dal_node i)) ~node ~disable_shard_validation:configuration.disable_shard_validation cloud diff --git a/tezt/tests/cloud/dal_node_helpers.ml b/tezt/tests/cloud/dal_node_helpers.ml index fc026b24ea3c..84bfb1c9f48f 100644 --- a/tezt/tests/cloud/dal_node_helpers.ml +++ b/tezt/tests/cloud/dal_node_helpers.ml @@ -6,6 +6,7 @@ (* *) (*****************************************************************************) +open Agent_kind open Scenarios_helpers open Tezos open Yes_crypto @@ -119,7 +120,7 @@ let init_producer cloud ~data_dir ~simulate_network ~external_rpc ~network ~snapshot ~memtrace ~ppx_profiling ~ppx_profiling_backends ~ignore_pkhs ~disable_shard_validation ~node_p2p_endpoint ~dal_node_p2p_endpoint teztale account i slot_index agent = - let name = Format.asprintf "producer-node-%i" i in + let name = name_of_daemon (Producer_l1_node i) in let () = toplog "Initializing the DAL producer %s" name in let data_dir = data_dir |> Option.map (fun data_dir -> data_dir // name) in let () = toplog "Init producer %s: init L1 node" name in @@ -156,7 +157,7 @@ let init_producer cloud ~data_dir ~simulate_network ~external_rpc ~network let* dal_node = let ignore_pkhs = if ignore_pkhs = [] then None else Some ignore_pkhs in Dal_node.Agent.create - ~name:(Format.asprintf "producer-dal-node-%i" i) + ~name:(name_of_daemon (Producer_dal_node i)) ~node ~disable_shard_validation ?ignore_pkhs @@ -229,7 +230,7 @@ let init_observer cloud ~data_dir ~simulate_network ~external_rpc ~network ~snapshot ~memtrace ~ppx_profiling ~ppx_profiling_backends ~disable_shard_validation ~node_p2p_endpoint ~dal_node_p2p_endpoint teztale ~topic i agent = - let name = Format.asprintf "observer-node-%i" i in + let name = name_of_daemon (Observer_l1_node i) in let data_dir = data_dir |> Option.map (fun data_dir -> data_dir // name) in let env, with_yes_crypto = may_set_yes_crypto_env simulate_network in let* node = @@ -248,7 +249,7 @@ let init_observer cloud ~data_dir ~simulate_network ~external_rpc ~network in let* dal_node = Dal_node.Agent.create - ~name:(Format.asprintf "observer-dal-node-%i" i) + ~name:(name_of_daemon (Observer_dal_node i)) ~node ~disable_shard_validation cloud diff --git a/tezt/tests/cloud/echo_rollup.ml b/tezt/tests/cloud/echo_rollup.ml index 2071b47f5308..849ab080fd24 100644 --- a/tezt/tests/cloud/echo_rollup.ml +++ b/tezt/tests/cloud/echo_rollup.ml @@ -113,7 +113,7 @@ let init_echo_rollup cloud ~data_dir ~simulate_network ~external_rpc ~network in let* sc_rollup_node = Sc_rollup_node.Agent.create - ~name:(Format.asprintf "%s-rollup-node" name) + ~name:(name_of_daemon (Echo_rollup_node name)) ~base_dir:(Client.base_dir client) ~default_operator:operator.alias ~operators:[(Sc_rollup_node.Operating, operator.Account.alias)] diff --git a/tezt/tests/cloud/etherlink_helpers.ml b/tezt/tests/cloud/etherlink_helpers.ml index 69d30a81cc8d..aba165838a98 100644 --- a/tezt/tests/cloud/etherlink_helpers.ml +++ b/tezt/tests/cloud/etherlink_helpers.ml @@ -284,7 +284,7 @@ let init_etherlink_operator_setup cloud ~data_dir ~external_rpc ~network in let* sc_rollup_node = Sc_rollup_node.Agent.create - ~name:(Format.asprintf "etherlink-%s-rollup-node" name) + ~name:(name_of_daemon (Etherlink_sc_rollup_node name)) ~base_dir:(Client.base_dir client) ~default_operator:account.alias ~operators @@ -400,7 +400,7 @@ let init_etherlink_operator_setup cloud ~data_dir ~external_rpc ~network ] else None) ()) - ~name:(Format.asprintf "etherlink-%s-evm-node" name) + ~name:(name_of_daemon (Etherlink_evm_node name)) ~mode endpoint cloud @@ -436,7 +436,7 @@ let init_etherlink_producer_setup operator name ~node_p2p_endpoint ~rpc_external let* node = Node.Agent.init ~rpc_external - ~name:(Format.asprintf "etherlink-%s-node" name) + ~name:(name_of_daemon (Etherlink_producer_node name)) ~arguments:[Peer node_p2p_endpoint; Synchronisation_threshold 0] cloud agent @@ -464,7 +464,7 @@ let init_etherlink_producer_setup operator name ~node_p2p_endpoint ~rpc_external in let* sc_rollup_node = Sc_rollup_node.Agent.create - ~name:(Format.asprintf "etherlink-%s-rollup-node" name) + ~name:(name_of_daemon (Etherlink_sc_rollup_node name)) ~base_dir:(Client.base_dir client) cloud agent @@ -502,7 +502,7 @@ let init_etherlink_producer_setup operator name ~node_p2p_endpoint ~rpc_external (* TODO: try using this local EVM node for Floodgate confirmations. *) let* evm_node = Evm_node.Agent.init - ~name:(Format.asprintf "etherlink-%s-evm-node" name) + ~name:(name_of_daemon (Etherlink_evm_node name)) ~mode endpoint cloud -- GitLab