From 0f577f8a2c69f3731c4a719d2542c4720a6041cb Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Fri, 18 Jul 2025 07:27:00 +0200 Subject: [PATCH] CI: datadog-friendly [pipeline_type] for child pipelines In the request snippet example below, double quotes are mandatory because of the use of a colon. @pipeline_type:"before_merging:debian_repository_partial_auto" With this change, we can avoid using the quotes: @pipeline_type:before_merging-debian_repository_partial_auto --- .gitlab/ci/pipelines/before_merging.yml | 14 +++++++------- .gitlab/ci/pipelines/merge_train.yml | 6 +++--- .gitlab/ci/pipelines/schedule_extended_test.yml | 8 ++++---- ci/lib_tezos_ci/tezos_ci.ml | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 95b3b4cd462c..a92f42454f7b 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -1532,7 +1532,7 @@ select_tezts: trigger:debian_repository_partial_auto: stage: test variables: - PIPELINE_TYPE: before_merging:debian_repository_partial_auto + PIPELINE_TYPE: before_merging-debian_repository_partial_auto rules: - changes: - .gitlab/ci/pipelines/debian_repository_partial_auto.yml @@ -1559,7 +1559,7 @@ trigger:debian_repository_partial_auto: trigger:rpm_repository_partial_auto: stage: test variables: - PIPELINE_TYPE: before_merging:rpm_repository_partial_auto + PIPELINE_TYPE: before_merging-rpm_repository_partial_auto rules: - changes: - .gitlab/ci/pipelines/rpm_repository_partial_auto.yml @@ -1583,7 +1583,7 @@ trigger:rpm_repository_partial_auto: trigger:homebrew_auto: stage: test variables: - PIPELINE_TYPE: before_merging:homebrew_auto + PIPELINE_TYPE: before_merging-homebrew_auto rules: - changes: - .gitlab/ci/pipelines/homebrew_auto.yml @@ -4231,7 +4231,7 @@ documentation:linkcheck: trigger:homebrew: stage: manual variables: - PIPELINE_TYPE: before_merging:homebrew + PIPELINE_TYPE: before_merging-homebrew rules: - when: manual allow_failure: true @@ -4243,7 +4243,7 @@ trigger:homebrew: trigger:rpm_repository_partial: stage: manual variables: - PIPELINE_TYPE: before_merging:rpm_repository_partial + PIPELINE_TYPE: before_merging-rpm_repository_partial rules: - when: manual allow_failure: true @@ -4255,7 +4255,7 @@ trigger:rpm_repository_partial: trigger:debian_repository_partial: stage: manual variables: - PIPELINE_TYPE: before_merging:debian_repository_partial + PIPELINE_TYPE: before_merging-debian_repository_partial rules: - when: manual allow_failure: true @@ -4267,7 +4267,7 @@ trigger:debian_repository_partial: trigger:base_images: stage: manual variables: - PIPELINE_TYPE: before_merging:base_images + PIPELINE_TYPE: before_merging-base_images rules: - when: manual allow_failure: true diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 9a080b8f4d2d..6c8f289aeb2e 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -1531,7 +1531,7 @@ select_tezts: trigger:debian_repository_partial_auto: stage: test variables: - PIPELINE_TYPE: merge_train:debian_repository_partial_auto + PIPELINE_TYPE: merge_train-debian_repository_partial_auto rules: - changes: - .gitlab/ci/pipelines/debian_repository_partial_auto.yml @@ -1558,7 +1558,7 @@ trigger:debian_repository_partial_auto: trigger:rpm_repository_partial_auto: stage: test variables: - PIPELINE_TYPE: merge_train:rpm_repository_partial_auto + PIPELINE_TYPE: merge_train-rpm_repository_partial_auto rules: - changes: - .gitlab/ci/pipelines/rpm_repository_partial_auto.yml @@ -1582,7 +1582,7 @@ trigger:rpm_repository_partial_auto: trigger:homebrew_auto: stage: test variables: - PIPELINE_TYPE: merge_train:homebrew_auto + PIPELINE_TYPE: merge_train-homebrew_auto rules: - changes: - .gitlab/ci/pipelines/homebrew_auto.yml diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 90aa00dcdd6d..3363be2668b2 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -1803,7 +1803,7 @@ opam:all_7: trigger:debian_repository_full: stage: test variables: - PIPELINE_TYPE: schedule_extended_test:debian_repository_full + PIPELINE_TYPE: schedule_extended_test-debian_repository_full needs: [] trigger: include: .gitlab/ci/pipelines/debian_repository_full.yml @@ -1812,7 +1812,7 @@ trigger:debian_repository_full: trigger:rpm_repository_full: stage: test variables: - PIPELINE_TYPE: schedule_extended_test:rpm_repository_full + PIPELINE_TYPE: schedule_extended_test-rpm_repository_full needs: [] trigger: include: .gitlab/ci/pipelines/rpm_repository_full.yml @@ -1821,7 +1821,7 @@ trigger:rpm_repository_full: trigger:homebrew: stage: test variables: - PIPELINE_TYPE: schedule_extended_test:homebrew + PIPELINE_TYPE: schedule_extended_test-homebrew rules: - when: always needs: [] @@ -1832,7 +1832,7 @@ trigger:homebrew: trigger:base_images: stage: images variables: - PIPELINE_TYPE: schedule_extended_test:base_images + PIPELINE_TYPE: schedule_extended_test-base_images rules: - when: always needs: [] diff --git a/ci/lib_tezos_ci/tezos_ci.ml b/ci/lib_tezos_ci/tezos_ci.ml index c93a82b5c1cd..555be1fce9f2 100644 --- a/ci/lib_tezos_ci/tezos_ci.ml +++ b/ci/lib_tezos_ci/tezos_ci.ml @@ -1051,7 +1051,7 @@ let trigger_job ?(dependencies = Staged []) ?rules ?description ~__POS__ ~stage let pipeline_type = match parent_pipeline_name with | None -> child_pipeline_name - | Some parent_name -> parent_name ^ ":" ^ child_pipeline_name + | Some parent_name -> parent_name ^ "-" ^ child_pipeline_name in let trigger_job = Gitlab_ci.Util.trigger_job -- GitLab