diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 5b8d1fde5ccbb310843771c1025119421be6415f..5a76e45f1a774bb8fdfa66ee9860a1c5462ac383 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 8adb86222c7a839f940099a11c9503f18624fae5..eb905144405ceb19528a7594680d64b9be1dac69 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 be49b1fa83e44cd8c59c778bfe9b86f90262173a..00d1cdcfc86bf3a9f401f15a7f37f10401067612 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 6ed320c76904371889cd3834025408fde2c23396..9158aec6878903b5c783c1053d49aec85ac72058 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 964c770ba201135c3cda0e60a4cfec7deaf75ec8..1891b5643d55ffbf2ac47e1fdd4972fbdfdab2b1 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