From 5a1de5100a8e454a93ca351aaddcb0b5d0977f16 Mon Sep 17 00:00:00 2001 From: Fayssal Defaa Date: Tue, 16 Jun 2026 12:28:34 +0200 Subject: [PATCH 1/3] ci: add manual job to trigger dd-trace-py downstream pipeline Adds a `trigger_dd_trace_py` manual job that triggers the DataDog/apm-reliability/dd-trace-py pipeline on demand from the GitLab UI. The target branch is configurable via DD_TRACE_PY_BRANCH (defaults to fayssal/auto-update-libdatadog). Co-Authored-By: Claude Opus 4.8 (1M context) --- .gitlab-ci.yml | 4 ++++ .gitlab/dd-trace-py.yml | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 .gitlab/dd-trace-py.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 255c62d7c6..076d48d9e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,10 +4,14 @@ variables: DOWNSTREAM_BRANCH: value: "main" description: "downstream jobs are triggered on this branch" + DD_TRACE_PY_BRANCH: + value: "fayssal/auto-update-libdatadog" + description: "the dd-trace-py branch the manual trigger_dd_trace_py job runs on" include: - local: .gitlab/benchmarks.yml - local: .gitlab/fuzz.yml + - local: .gitlab/dd-trace-py.yml trigger_internal_build: variables: diff --git a/.gitlab/dd-trace-py.yml b/.gitlab/dd-trace-py.yml new file mode 100644 index 0000000000..f4038950a9 --- /dev/null +++ b/.gitlab/dd-trace-py.yml @@ -0,0 +1,17 @@ +# Manual trigger for the dd-trace-py downstream pipeline. +# This lets a maintainer test the current libdatadog commit against dd-trace-py +# on demand from the GitLab pipeline UI. + +trigger_dd_trace_py: + variables: + LIBDATADOG_COMMIT_BRANCH: $CI_COMMIT_BRANCH + LIBDATADOG_COMMIT_SHA: $CI_COMMIT_SHA + LIBDATADOG_SHORT_COMMIT_SHA: ${CI_COMMIT_SHORT_SHA} + LIBDATADOG_COMMIT_TAG: $CI_COMMIT_TAG + rules: + - when: manual + allow_failure: true + trigger: + project: DataDog/apm-reliability/dd-trace-py + strategy: depend + branch: $DD_TRACE_PY_BRANCH From 538902fa15b89cf84519760f57affff68e39fb75 Mon Sep 17 00:00:00 2001 From: Fayssal Defaa Date: Tue, 16 Jun 2026 12:36:08 +0200 Subject: [PATCH 2/3] ci: pass UPDATE_LIBDATADOG_VERSION to dd-trace-py trigger Always passes UPDATE_LIBDATADOG_VERSION="true" to the downstream dd-trace-py pipeline from the manual trigger_dd_trace_py job. Co-Authored-By: Claude Opus 4.8 (1M context) --- .gitlab/dd-trace-py.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab/dd-trace-py.yml b/.gitlab/dd-trace-py.yml index f4038950a9..bd7e8d08a2 100644 --- a/.gitlab/dd-trace-py.yml +++ b/.gitlab/dd-trace-py.yml @@ -8,6 +8,7 @@ trigger_dd_trace_py: LIBDATADOG_COMMIT_SHA: $CI_COMMIT_SHA LIBDATADOG_SHORT_COMMIT_SHA: ${CI_COMMIT_SHORT_SHA} LIBDATADOG_COMMIT_TAG: $CI_COMMIT_TAG + UPDATE_LIBDATADOG_VERSION: "true" rules: - when: manual allow_failure: true From f93ba28eb5a6c420de14df98e4762f5d7634377e Mon Sep 17 00:00:00 2001 From: Fayssal Defaa Date: Thu, 18 Jun 2026 15:21:36 +0200 Subject: [PATCH 3/3] ci: run dd-trace-py trigger automatically on push to main The trigger_dd_trace_py job now runs on every push to main in addition to remaining manually triggerable on other branches. Co-Authored-By: Claude Opus 4.8 (1M context) --- .gitlab/dd-trace-py.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab/dd-trace-py.yml b/.gitlab/dd-trace-py.yml index bd7e8d08a2..4c19e0fa3e 100644 --- a/.gitlab/dd-trace-py.yml +++ b/.gitlab/dd-trace-py.yml @@ -10,6 +10,11 @@ trigger_dd_trace_py: LIBDATADOG_COMMIT_TAG: $CI_COMMIT_TAG UPDATE_LIBDATADOG_VERSION: "true" rules: + # Run automatically on every push to the default branch. + - if: '$CI_COMMIT_BRANCH == "main"' + when: on_success + allow_failure: true + # Otherwise allow a maintainer to trigger it manually from the pipeline UI. - when: manual allow_failure: true trigger: