chore(ci): base converged Agent image on -full; OTLP baselines use it

The two otlp-traces-ottl correctness tests pinned an external
registry.datadoghq.com/agent:X-full image for their DDOT baseline,
because the converged Agent+ADP image was built on -jmx (no OTel
collector). Build the converged image on -full instead -- a superset of
-jmx (same JMXFetch jar + Java 11 JRE, plus the DDOT otel-agent) -- and
switch the two ottl baselines to the saluki-images/datadog-agent:testing-release
placeholder like every other correctness test, so CI injects the bundled
converged image for those baselines automatically.

That removes the only external Agent image pins left in the test configs,
so the renovate custom manager no longer needs to scan test/correctness:
revert the ignorePaths override and the test fileMatch added alongside it
(the manager now covers just the Makefile and Windows LTSC pins).

Trade-off: this enlarges the publicly published converged image, since
-full also bundles DDOT/system-probe. Opening for team feedback on
whether that's acceptable versus keeping the test-config custom manager.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: jszwedko

.gitlab-ci.yml

@@ -56,7 +56,7 @@ variables:
   # Converged Datadog Agent-specific variables, which control how we build the converged Datadog Agent image that we
   # publicly publish.
   PUBLIC_DSD_VERSION: "7.80.1"
-  PUBLIC_DD_AGENT_VERSION: "7.80.1-jmx"
+  PUBLIC_DD_AGENT_VERSION: "7.80.1-full"
 
   # Base images to copy Agent Data Plane into, depending on whether the image is meant for our internal environment or
   # public registries.

docker/Dockerfile.datadog-agent

@@ -1,4 +1,4 @@
-ARG DD_AGENT_VERSION=7.80.1-jmx
+ARG DD_AGENT_VERSION=7.80.1-full
 ARG DD_AGENT_IMAGE=registry.datadoghq.com/agent:${DD_AGENT_VERSION}
 ARG ADP_IMAGE=saluki-images/agent-data-plane:testing-devel
 

renovate.json5

@@ -50,25 +50,6 @@
   //     weekly non-major group)
   "osvVulnerabilityAlerts": true,
 
-  // Paths Renovate skips entirely, before any manager (built-in or custom) extracts from them.
-  //
-  // This overrides the list inherited from `config:recommended` (via `:ignoreModulesAndTests`).
-  // We reproduce its defaults but drop the broad `**/test/**` entry: that pattern would otherwise
-  // hide test/correctness/cases/*/config.yaml from the custom Agent-pin manager below, so the
-  // OTLP baseline image pins would silently keep drifting. The only dependency files under test/
-  // that built-in managers recognize live in test/antithesis/deploy (a Dockerfile and a
-  // docker-compose), which we keep ignoring here to preserve current behavior.
-  "ignorePaths": [
-    "**/node_modules/**",
-    "**/bower_components/**",
-    "**/vendor/**",
-    "**/examples/**",
-    "**/__tests__/**",
-    "**/tests/**",
-    "**/__fixtures__/**",
-    "test/antithesis/**"
-  ],
-
   // Package-manager-specific rules.
   "packageRules": [
     // Use Cargo's semver interpretation for all Cargo dependencies. Cargo
@@ -111,13 +92,14 @@
   // Custom managers for Datadog Agent version pins that Renovate's built-in managers don't see.
   //
   // The `dockerfile` manager already bumps docker/Dockerfile.datadog-agent (the
-  // `registry.datadoghq.com/agent` FROM/ARG). But several other pins for the same Agent are
-  // hand-maintained in files no default manager parses, so they were silently left behind on past
-  // bumps (see the 7.80.1 -> 7.80.2 update). Manage them here, tied to the same depName
+  // `registry.datadoghq.com/agent` FROM/ARG). But a couple of other pins for the same Agent are
+  // hand-maintained in files no default manager parses -- the macOS test Agent version (Makefile)
+  // and the Windows LTSC base image (.gitlab/windows.yml) -- so they were silently left behind on
+  // past bumps (see the 7.80.1 -> 7.80.2 update). Manage them here, tied to the same depName
   // (`registry.datadoghq.com/agent`) so they bump in lockstep with -- and in the same PR as -- the
   // main Agent image.
   //
-  // `currentValue` captures only the numeric version; any image-tag suffix (-full, -ltsc2022, -jmx)
+  // `currentValue` captures only the numeric version; any image-tag suffix (-ltsc2022, -jmx, -full)
   // is matched but left out of the group, so Renovate rewrites just the number and preserves the
   // suffix in place. Because the suffixed tags are published together with the bare release, every
   // pin tracks the same single Agent version rather than drifting onto separate per-suffix streams.
@@ -126,13 +108,12 @@
       "customType": "regex",
       "fileMatch": [
         "(^|/)Makefile$",
-        "^\\.gitlab/windows\\.yml$",
-        "^test/correctness/cases/.+/config\\.yaml$"
+        "^\\.gitlab/windows\\.yml$"
       ],
       "matchStrings": [
         // Bare version, e.g. `MACOS_TEST_AGENT_VERSION ?= 7.80.2` (Makefile).
         "MACOS_TEST_AGENT_VERSION \\?= (?<currentValue>[\\d.]+)",
-        // Image pins, e.g. `registry.datadoghq.com/agent:7.80.2-full` or `:7.80.2-ltsc2022`.
+        // Image pin, e.g. `registry.datadoghq.com/agent:7.80.2-ltsc2022` (.gitlab/windows.yml).
         // The `-suffix` is matched but not captured, so only the number is rewritten.
         "registry\\.datadoghq\\.com/agent:(?<currentValue>[\\d.]+)(?:-[a-z0-9]+)?"
       ],

test/correctness/cases/otlp-traces-ottl-filtering/config.yaml

@@ -12,7 +12,7 @@ additional_span_ignore_fields:
   - metrics._top_level
   - metrics._dd.measured
 baseline:
-  image: registry.datadoghq.com/agent:7.80.1-full
+  image: saluki-images/datadog-agent:testing-release
   # Run DDOT (otel-agent) directly so the image entrypoint does not treat our args as a command to exec.
   #entrypoint:
   #  - /opt/datadog-agent/embedded/bin/otel-agent

test/correctness/cases/otlp-traces-ottl-transform/config.yaml

@@ -14,7 +14,7 @@ additional_span_ignore_fields:
   - metrics.http.status_code
   - meta.error.msg
 baseline:
-  image: registry.datadoghq.com/agent:7.80.1-full
+  image: saluki-images/datadog-agent:testing-release
   files:
     - collector.yaml:/etc/datadog-agent/otel-config.yaml
     - datadog_agent.yaml:/etc/datadog-agent/datadog.yaml