chore(ci): base converged Agent image on -full (#1908)

> Stacked on #1906 (`jszwedko/renovate-agent-version-pins`). Review/merge that first; this PR will retarget to `main` automatically once it lands.

## Summary

Switch to the `-full` image which contains both JMX and DDOT for correctness tests and the converged image we publish. This removes the need for the OTLP correctness tests to pin to published Agent `-full` images. It also enables deployment of the converged ADP image on internal clusters that also run DDOT.

## Test plan

- [x] Verified `-full` includes JMX: both `-jmx` and `-full` carry the same `jmxfetch.jar` + Java 11 JRE; `-full` additionally has `otel-agent`.
- [x] Rebuilt the converged `testing-release` image on `-full` and confirmed `otel-agent` (DDOT) is present.
- [x] Ran locally on the `-full` converged image — all pass: `otlp-traces-ottl-filtering`, `otlp-traces-ottl-transform` (baseline now runs DDOT from the converged image), plus `otlp-traces`, `otlp-metrics`, and `dsd-plain` to confirm no regression from the base-image change.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: jesse.szwedko <jesse.szwedko@datadoghq.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.2"
-  PUBLIC_DD_AGENT_VERSION: "7.80.2-jmx"
+  PUBLIC_DD_AGENT_VERSION: "7.80.2-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.2-jmx
+ARG DD_AGENT_VERSION=7.80.2-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.2-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.2-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