From 1fdbaa10084af9d7f64535e1182aa648f0b56160 Mon Sep 17 00:00:00 2001
From: Dinesh Gurumurthy <dinesh.gurumurthy@datadoghq.com>
Date: Thu, 10 Sep 2026 17:14:46 +0000
Subject: [PATCH 1/3] ci: build OTel operator images

---
 .gitlab-ci.yml                  | 3 +++
 .gitlab/one-pipeline.locked.yml | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7dd19530d4b..d81bb1cd04a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,6 +14,9 @@ variables:
   REPO_NOTIFICATION_CHANNEL: "#apm-python-release"
   RELEASE_ALLOW_TEST_FAILURES: false
   RELEASE_ALLOW_BENCHMARK_FAILURES: false
+  # Test the OpenTelemetry Operator-compatible Python image jobs from one-pipeline.
+  OTEL_OPERATOR_IMAGES_ENABLED: "true"
+  OTEL_OPERATOR_LANGUAGE: python
   # VPA Template configuration
   DD_VPA_TEMPLATE: "vpa-template-cpu-p70-10percent-2x-oom-min-cap"
   # CI_DEBUG_SERVICES: "true"
diff --git a/.gitlab/one-pipeline.locked.yml b/.gitlab/one-pipeline.locked.yml
index 0d756c4f697..b7f4c81b8aa 100644
--- a/.gitlab/one-pipeline.locked.yml
+++ b/.gitlab/one-pipeline.locked.yml
@@ -1,4 +1,4 @@
 # DO NOT EDIT THIS FILE MANUALLY
 # This file is auto-generated by automation.
 include:
-  - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/versions/1.3.1/one-pipeline.yml
+  - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/versions/1.5.0/one-pipeline.yml

From 32ffbf48b67814a8beb37c3856aebca19c870c69 Mon Sep 17 00:00:00 2001
From: Dinesh Gurumurthy <dinesh.gurumurthy@datadoghq.com>
Date: Thu, 10 Sep 2026 20:43:35 +0000
Subject: [PATCH 2/3] ci: isolate one-pipeline variables from tests

---
 .gitlab/testrunner.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab/testrunner.yml b/.gitlab/testrunner.yml
index 8e4cad2956a..a1cfa97c4c9 100644
--- a/.gitlab/testrunner.yml
+++ b/.gitlab/testrunner.yml
@@ -10,6 +10,13 @@ variables:
   tags: [ "arch:amd64" ]
   timeout: 20m
   before_script:
+    # AIDEV-NOTE: These one-pipeline build controls are not OpenTelemetry SDK configuration.
+    - >-
+      unset
+      OTEL_OPERATOR_IMAGES_ENABLED
+      OTEL_OPERATOR_IMAGE_NAME
+      OTEL_OPERATOR_LANGUAGE
+      OTEL_OPERATOR_IMAGE_MAX_SIZE_BYTES
     - ulimit -c unlimited
     - git config --global --add safe.directory ${CI_PROJECT_DIR}
     - pyenv global 3.12 3.9 3.10 3.11 3.13 3.14 3.15-dev

From c7b2c7d06c1e14a3f6f2656c0c59aa164409a19a Mon Sep 17 00:00:00 2001
From: Dinesh Gurumurthy <dinesh.gurumurthy@datadoghq.com>
Date: Thu, 10 Sep 2026 20:57:47 +0000
Subject: [PATCH 3/3] ci: isolate operator variables from wheel tests

---
 .gitlab/scripts/build-wheel-helpers.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/.gitlab/scripts/build-wheel-helpers.sh b/.gitlab/scripts/build-wheel-helpers.sh
index 43d0f1bf920..c0b3486164a 100755
--- a/.gitlab/scripts/build-wheel-helpers.sh
+++ b/.gitlab/scripts/build-wheel-helpers.sh
@@ -273,6 +273,13 @@ finalize() {
 
 # Test wheel
 test_wheel() {
+  # AIDEV-NOTE: These one-pipeline build controls are not OpenTelemetry SDK configuration.
+  unset \
+    OTEL_OPERATOR_IMAGES_ENABLED \
+    OTEL_OPERATOR_IMAGE_NAME \
+    OTEL_OPERATOR_LANGUAGE \
+    OTEL_OPERATOR_IMAGE_MAX_SIZE_BYTES
+
   section_start "test_wheel" "Testing wheel"
   export UV_LINK_MODE=copy
   export TEST_WHEEL_DIR="${WORK_DIR}/test_wheel"