From 26fa194e82c84df3bc8926a868bd90630c491715 Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Thu, 31 Jul 2025 16:40:17 +0200 Subject: [PATCH 1/4] Tezlink/Tezt Cloud: add a module to run daemons for TzKT --- tezt/tests/cloud/tezlink.ml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tezt/tests/cloud/tezlink.ml b/tezt/tests/cloud/tezlink.ml index 78dcb071d5f8..1f0184a42a55 100644 --- a/tezt/tests/cloud/tezlink.ml +++ b/tezt/tests/cloud/tezlink.ml @@ -13,6 +13,24 @@ module Cli = Scenarios_cli open Scenarios_helpers open Tezos +module Tzkt_process = struct + module Parameters = struct + type persistent_state = unit + + type session_state = unit + + let base_default_name = "tzkt" + + let default_colors = Log.Color.[|FG.green; FG.yellow; FG.cyan; FG.magenta|] + end + + include Daemon.Make (Parameters) + + let run ?runner cmd args = + let daemon = create ?runner ~path:cmd () in + run ?runner daemon () args +end + let init_tzkt ~tzkt_api_port ~agent ~tezlink_sandbox_endpoint = (* Set of functions helpful for Tzkt setup *) let spawn_run ?name cmd args = -- GitLab From f6ec2f79113f397bf2249a8e1ccf9b5fb9d0df57 Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Thu, 31 Jul 2025 16:44:48 +0200 Subject: [PATCH 2/4] Tezlink/Tezt Cloud: use daemons when starting TzKT processes --- tezt/tests/cloud/tezlink.ml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tezt/tests/cloud/tezlink.ml b/tezt/tests/cloud/tezlink.ml index 1f0184a42a55..b398f6f1fabc 100644 --- a/tezt/tests/cloud/tezlink.ml +++ b/tezt/tests/cloud/tezlink.ml @@ -150,9 +150,10 @@ let init_tzkt ~tzkt_api_port ~agent ~tezlink_sandbox_endpoint = in (* Run the Tzkt indexer and Tzkt API *) + let runner = Agent.runner agent in let* () = - run - ~name:"tzkt-indexer" + Tzkt_process.run + ?runner "sh" [ "-c"; @@ -164,8 +165,8 @@ let init_tzkt ~tzkt_api_port ~agent ~tezlink_sandbox_endpoint = indexer_port_arg; ] and* () = - run - ~name:"tzkt-api" + Tzkt_process.run + ?runner "sh" [ "-c"; -- GitLab From 06d79741ffd42a599059daf99577f15951bc0b29 Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Fri, 1 Aug 2025 00:28:02 +0200 Subject: [PATCH 3/4] Tezlink/Tezt Cloud: separate the execution of TzKT processes Because they don't need to be synchronized anymore. --- tezt/tests/cloud/tezlink.ml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tezt/tests/cloud/tezlink.ml b/tezt/tests/cloud/tezlink.ml index b398f6f1fabc..54961de7e6f5 100644 --- a/tezt/tests/cloud/tezlink.ml +++ b/tezt/tests/cloud/tezlink.ml @@ -164,7 +164,8 @@ let init_tzkt ~tzkt_api_port ~agent ~tezlink_sandbox_endpoint = database_arg indexer_port_arg; ] - and* () = + in + let* () = Tzkt_process.run ?runner "sh" -- GitLab From 5b52c541b127fe6a6ff854b74318326a99233365 Mon Sep 17 00:00:00 2001 From: Nicolas Ayache Date: Fri, 1 Aug 2025 13:43:56 +0000 Subject: [PATCH 4/4] Tezlink/Tezt Cloud: precise TzKT process name --- tezt/tests/cloud/tezlink.ml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tezt/tests/cloud/tezlink.ml b/tezt/tests/cloud/tezlink.ml index 54961de7e6f5..7dabf818620f 100644 --- a/tezt/tests/cloud/tezlink.ml +++ b/tezt/tests/cloud/tezlink.ml @@ -26,8 +26,9 @@ module Tzkt_process = struct include Daemon.Make (Parameters) - let run ?runner cmd args = - let daemon = create ?runner ~path:cmd () in + let run ?runner ~suffix cmd args = + let process_name = sf "%s-%s" Parameters.base_default_name suffix in + let daemon = create ?runner ~name:process_name ~path:cmd () in run ?runner daemon () args end @@ -154,6 +155,7 @@ let init_tzkt ~tzkt_api_port ~agent ~tezlink_sandbox_endpoint = let* () = Tzkt_process.run ?runner + ~suffix:"indexer" "sh" [ "-c"; @@ -168,6 +170,7 @@ let init_tzkt ~tzkt_api_port ~agent ~tezlink_sandbox_endpoint = let* () = Tzkt_process.run ?runner + ~suffix:"api" "sh" [ "-c"; -- GitLab