From 368eee9e75dbe750686060a3ed16f485ba99f7a4 Mon Sep 17 00:00:00 2001
From: Julien <julien.tesson@nomadic-labs.com>
Date: Tue, 2 Dec 2025 17:13:36 +0100
Subject: [PATCH] ci: Update build-layer1-profiling job to build all concerned
 binaries

---
 .gitlab/ci/pipelines/before_merging.yml       | 23 ++++++++----
 .gitlab/ci/pipelines/merge_train.yml          | 23 ++++++++----
 .gitlab/ci/pipelines/octez_monitoring.yml     | 23 ++++++++----
 .../ci/pipelines/schedule_extended_test.yml   | 23 ++++++++----
 ci/lib_tezos_ci_jobs/common.ml                | 36 +++++++++++--------
 5 files changed, 86 insertions(+), 42 deletions(-)

diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml
index 5b8d1fde5ccb..5a76e45f1a77 100644
--- a/.gitlab/ci/pipelines/before_merging.yml
+++ b/.gitlab/ci/pipelines/before_merging.yml
@@ -1301,11 +1301,14 @@ build-layer1-profiling:
   script:
   - scripts/slim-mode.sh on
   - scripts/custom-flags.sh set -opaque
-  - TEZOS_PPX_PROFILER=profiling make build OCTEZ_EXECUTABLES?="octez-node octez-client"
-  - TEZOS_PPX_PROFILER=opentelemetry make build OCTEZ_EXECUTABLES?="octez-node octez-client"
-  - mkdir -p octez-binaries/x86_64/
-  - mv octez-node octez-binaries/x86_64/
-  - mv octez-client octez-binaries/x86_64/
+  - TEZOS_PPX_PROFILER=profiling make build OCTEZ_EXECUTABLES?="octez-node octez-dal-node
+    octez-baker octez-client"
+  - mkdir -p octez-binaries/x86_64/profiler
+  - mv octez-node octez-dal-node octez-baker octez-client octez-binaries/x86_64/profiler
+  - TEZOS_PPX_PROFILER=opentelemetry make build OCTEZ_EXECUTABLES?="octez-node octez-dal-node
+    octez-baker octez-client"
+  - mkdir -p octez-binaries/x86_64/telemetry
+  - mv octez-node octez-dal-node octez-baker octez-client octez-binaries/x86_64/telemetry
   - . ./scripts/ci/datadog_send_job_script_step_time.sh || true
   after_script:
   - . ./scripts/ci/datadog_send_job_cache_info.sh 'after'
@@ -1318,8 +1321,14 @@ build-layer1-profiling:
   artifacts:
     expire_in: 1 day
     paths:
-    - ./octez-binaries/x86_64/octez-node
-    - ./octez-binaries/x86_64/octez-client
+    - ./octez-binaries/x86_64/profiler/octez-node
+    - ./octez-binaries/x86_64/profiler/octez-dal-node
+    - ./octez-binaries/x86_64/profiler/octez-baker
+    - ./octez-binaries/x86_64/profiler/octez-client
+    - ./octez-binaries/x86_64/telemetry/octez-node
+    - ./octez-binaries/x86_64/telemetry/octez-dal-node
+    - ./octez-binaries/x86_64/telemetry/octez-baker
+    - ./octez-binaries/x86_64/telemetry/octez-client
 
 trigger:debian_repository_partial_auto:
   stage: test
diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml
index 8adb86222c7a..eb905144405c 100644
--- a/.gitlab/ci/pipelines/merge_train.yml
+++ b/.gitlab/ci/pipelines/merge_train.yml
@@ -1300,11 +1300,14 @@ build-layer1-profiling:
   script:
   - scripts/slim-mode.sh on
   - scripts/custom-flags.sh set -opaque
-  - TEZOS_PPX_PROFILER=profiling make build OCTEZ_EXECUTABLES?="octez-node octez-client"
-  - TEZOS_PPX_PROFILER=opentelemetry make build OCTEZ_EXECUTABLES?="octez-node octez-client"
-  - mkdir -p octez-binaries/x86_64/
-  - mv octez-node octez-binaries/x86_64/
-  - mv octez-client octez-binaries/x86_64/
+  - TEZOS_PPX_PROFILER=profiling make build OCTEZ_EXECUTABLES?="octez-node octez-dal-node
+    octez-baker octez-client"
+  - mkdir -p octez-binaries/x86_64/profiler
+  - mv octez-node octez-dal-node octez-baker octez-client octez-binaries/x86_64/profiler
+  - TEZOS_PPX_PROFILER=opentelemetry make build OCTEZ_EXECUTABLES?="octez-node octez-dal-node
+    octez-baker octez-client"
+  - mkdir -p octez-binaries/x86_64/telemetry
+  - mv octez-node octez-dal-node octez-baker octez-client octez-binaries/x86_64/telemetry
   - . ./scripts/ci/datadog_send_job_script_step_time.sh || true
   after_script:
   - . ./scripts/ci/datadog_send_job_cache_info.sh 'after'
@@ -1317,8 +1320,14 @@ build-layer1-profiling:
   artifacts:
     expire_in: 1 day
     paths:
-    - ./octez-binaries/x86_64/octez-node
-    - ./octez-binaries/x86_64/octez-client
+    - ./octez-binaries/x86_64/profiler/octez-node
+    - ./octez-binaries/x86_64/profiler/octez-dal-node
+    - ./octez-binaries/x86_64/profiler/octez-baker
+    - ./octez-binaries/x86_64/profiler/octez-client
+    - ./octez-binaries/x86_64/telemetry/octez-node
+    - ./octez-binaries/x86_64/telemetry/octez-dal-node
+    - ./octez-binaries/x86_64/telemetry/octez-baker
+    - ./octez-binaries/x86_64/telemetry/octez-client
 
 trigger:debian_repository_partial_auto:
   stage: test
diff --git a/.gitlab/ci/pipelines/octez_monitoring.yml b/.gitlab/ci/pipelines/octez_monitoring.yml
index be49b1fa83e4..00d1cdcfc86b 100644
--- a/.gitlab/ci/pipelines/octez_monitoring.yml
+++ b/.gitlab/ci/pipelines/octez_monitoring.yml
@@ -120,11 +120,14 @@ build-layer1-profiling:
   script:
   - scripts/slim-mode.sh on
   - scripts/custom-flags.sh set -opaque
-  - TEZOS_PPX_PROFILER=profiling make build OCTEZ_EXECUTABLES?="octez-node octez-client"
-  - TEZOS_PPX_PROFILER=opentelemetry make build OCTEZ_EXECUTABLES?="octez-node octez-client"
-  - mkdir -p octez-binaries/x86_64/
-  - mv octez-node octez-binaries/x86_64/
-  - mv octez-client octez-binaries/x86_64/
+  - TEZOS_PPX_PROFILER=profiling make build OCTEZ_EXECUTABLES?="octez-node octez-dal-node
+    octez-baker octez-client"
+  - mkdir -p octez-binaries/x86_64/profiler
+  - mv octez-node octez-dal-node octez-baker octez-client octez-binaries/x86_64/profiler
+  - TEZOS_PPX_PROFILER=opentelemetry make build OCTEZ_EXECUTABLES?="octez-node octez-dal-node
+    octez-baker octez-client"
+  - mkdir -p octez-binaries/x86_64/telemetry
+  - mv octez-node octez-dal-node octez-baker octez-client octez-binaries/x86_64/telemetry
   - . ./scripts/ci/datadog_send_job_script_step_time.sh || true
   after_script:
   - . ./scripts/ci/datadog_send_job_cache_info.sh 'after'
@@ -137,8 +140,14 @@ build-layer1-profiling:
   artifacts:
     expire_in: never
     paths:
-    - ./octez-binaries/x86_64/octez-node
-    - ./octez-binaries/x86_64/octez-client
+    - ./octez-binaries/x86_64/profiler/octez-node
+    - ./octez-binaries/x86_64/profiler/octez-dal-node
+    - ./octez-binaries/x86_64/profiler/octez-baker
+    - ./octez-binaries/x86_64/profiler/octez-client
+    - ./octez-binaries/x86_64/telemetry/octez-node
+    - ./octez-binaries/x86_64/telemetry/octez-dal-node
+    - ./octez-binaries/x86_64/telemetry/octez-baker
+    - ./octez-binaries/x86_64/telemetry/octez-client
 
 teztale.build:static-arm64:
   image: ${ci_image_name}/build:${ci_image_tag}
diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml
index 6ed320c76904..9158aec68789 100644
--- a/.gitlab/ci/pipelines/schedule_extended_test.yml
+++ b/.gitlab/ci/pipelines/schedule_extended_test.yml
@@ -921,11 +921,14 @@ build-layer1-profiling:
   script:
   - scripts/slim-mode.sh on
   - scripts/custom-flags.sh set -opaque
-  - TEZOS_PPX_PROFILER=profiling make build OCTEZ_EXECUTABLES?="octez-node octez-client"
-  - TEZOS_PPX_PROFILER=opentelemetry make build OCTEZ_EXECUTABLES?="octez-node octez-client"
-  - mkdir -p octez-binaries/x86_64/
-  - mv octez-node octez-binaries/x86_64/
-  - mv octez-client octez-binaries/x86_64/
+  - TEZOS_PPX_PROFILER=profiling make build OCTEZ_EXECUTABLES?="octez-node octez-dal-node
+    octez-baker octez-client"
+  - mkdir -p octez-binaries/x86_64/profiler
+  - mv octez-node octez-dal-node octez-baker octez-client octez-binaries/x86_64/profiler
+  - TEZOS_PPX_PROFILER=opentelemetry make build OCTEZ_EXECUTABLES?="octez-node octez-dal-node
+    octez-baker octez-client"
+  - mkdir -p octez-binaries/x86_64/telemetry
+  - mv octez-node octez-dal-node octez-baker octez-client octez-binaries/x86_64/telemetry
   - . ./scripts/ci/datadog_send_job_script_step_time.sh || true
   after_script:
   - . ./scripts/ci/datadog_send_job_cache_info.sh 'after'
@@ -938,8 +941,14 @@ build-layer1-profiling:
   artifacts:
     expire_in: 1 day
     paths:
-    - ./octez-binaries/x86_64/octez-node
-    - ./octez-binaries/x86_64/octez-client
+    - ./octez-binaries/x86_64/profiler/octez-node
+    - ./octez-binaries/x86_64/profiler/octez-dal-node
+    - ./octez-binaries/x86_64/profiler/octez-baker
+    - ./octez-binaries/x86_64/profiler/octez-client
+    - ./octez-binaries/x86_64/telemetry/octez-node
+    - ./octez-binaries/x86_64/telemetry/octez-dal-node
+    - ./octez-binaries/x86_64/telemetry/octez-baker
+    - ./octez-binaries/x86_64/telemetry/octez-client
 
 test_sdk_rust:
   image: ${rust_toolchain_image_name}:${rust_toolchain_image_tag}
diff --git a/ci/lib_tezos_ci_jobs/common.ml b/ci/lib_tezos_ci_jobs/common.ml
index 964c770ba201..1891b5643d55 100644
--- a/ci/lib_tezos_ci_jobs/common.ml
+++ b/ci/lib_tezos_ci_jobs/common.ml
@@ -289,6 +289,21 @@ module Build = struct
     |> enable_cargo_cache
 
   let job_build_layer1_profiling ?rules ?(expire_in = Duration (Days 1)) () =
+    let profiled_binaries =
+      ["octez-node"; "octez-dal-node"; "octez-baker"; "octez-client"]
+    in
+    let binaries =
+      List.map
+        (Filename.concat "./octez-binaries/x86_64/profiler/")
+        profiled_binaries
+      @ List.map
+          (Filename.concat "./octez-binaries/x86_64/telemetry/")
+          profiled_binaries
+    in
+    let profiled_binaries_string = String.concat " " profiled_binaries in
+    let octez_executables =
+      "OCTEZ_EXECUTABLES?=\"" ^ profiled_binaries_string ^ "\""
+    in
     job
       ~__POS__
       ~stage:Stages.build
@@ -296,13 +311,7 @@ module Build = struct
       ?rules
       ~name:"build-layer1-profiling"
       ~cpu:Very_high
-      ~artifacts:
-        (artifacts
-           ~expire_in
-           [
-             "./octez-binaries/x86_64/octez-node";
-             "./octez-binaries/x86_64/octez-client";
-           ])
+      ~artifacts:(artifacts ~expire_in binaries)
       ~before_script:
         (Helpers.before_script
            ~take_ownership:true
@@ -315,14 +324,13 @@ module Build = struct
         (* turn on -opaque for all subsequent builds *)
         "scripts/custom-flags.sh set -opaque";
         (* 1) compile with PPX profiling *)
-        "TEZOS_PPX_PROFILER=profiling make build \
-         OCTEZ_EXECUTABLES?=\"octez-node octez-client\"";
+        "TEZOS_PPX_PROFILER=profiling make build " ^ octez_executables;
+        "mkdir -p octez-binaries/x86_64/profiler";
+        "mv " ^ profiled_binaries_string ^ " octez-binaries/x86_64/profiler";
         (* 2) compile with OpenTelemetry PPX (overwrites binaries) *)
-        "TEZOS_PPX_PROFILER=opentelemetry make build \
-         OCTEZ_EXECUTABLES?=\"octez-node octez-client\"";
-        "mkdir -p octez-binaries/x86_64/";
-        "mv octez-node octez-binaries/x86_64/";
-        "mv octez-client octez-binaries/x86_64/";
+        "TEZOS_PPX_PROFILER=opentelemetry make build " ^ octez_executables;
+        "mkdir -p octez-binaries/x86_64/telemetry";
+        "mv " ^ profiled_binaries_string ^ " octez-binaries/x86_64/telemetry";
       ]
     |> enable_cargo_cache |> enable_sccache
 end
-- 
GitLab