[mq] [skip ddci] working branch - merge f270200 on top of main at 1241668

{"baseBranch":"main","baseCommit":"12416689cc4717225d2d3358704eda3712276f1d","createdAt":"2026-07-18T02:26:45.558760Z","headSha":"f270200622d784fcc00a05edb89a1e357b90e88b","id":"bc3551fe-ecd2-4074-80e0-0f04b4267e02","priority":"200","pullRequestNumber":"52887","queuedAt":"2026-07-18T02:26:45.557476Z","status":"STATUS_QUEUED"}

Author: gh-worker-dd-mergequeue-cf854d[bot]

omnibus/config/projects/agent.rb

@@ -239,6 +239,7 @@
   dependency 'datadog-agent-installer-symlinks'
   if do_repackage?
     dependency "existing-agent-package"
+    dependency "systemd" if linux_target?
     dependency "datadog-agent"
   else
     dependency "package-artifact"

omnibus/config/software/datadog-agent-installer-symlinks.rb

@@ -10,7 +10,8 @@
 
   block do
     if linux_target? and install_dir == '/opt/datadog-agent'
-      command "bazel run --//:install_dir=#{install_dir} -- //packages/agent/linux:install --destdir='/'",
+      destdir = ENV["OMNIBUS_BASE_DIR"] || "/"
+      command "bazel run --//:install_dir=#{install_dir} -- //packages/agent/linux:install --destdir='#{destdir}'",
         :live_stream => Omnibus.logger.live_stream(:info)
       project.extra_package_file "/opt/datadog-packages/datadog-agent"
       project.extra_package_file "/opt/datadog-packages/run"

omnibus/config/software/datadog-agent.rb

@@ -32,7 +32,13 @@
 
 source path: '..',
        options: {
-         exclude: ["**/.cache/**/*", "**/testdata/**/*"],
+         exclude: [
+           "**/.cache/**/*",
+           "**/testdata/**/*",
+           # Git's fsmonitor daemon creates a Unix socket that breaks builds both
+           # on the host and in a container with a bind-mounted repo.
+           "**/.git/fsmonitor--daemon.ipc",
+         ],
        }
 relative_path 'src/github.com/DataDog/datadog-agent'
 

omnibus/config/software/datadog-dogstatsd.rb

@@ -10,7 +10,7 @@
 
 source path: '..',
        options: {
-         exclude: ["**/.cache/**/*"],
+         exclude: ["**/.cache/**/*", "**/.git/fsmonitor--daemon.ipc"],
        }
 relative_path 'src/github.com/DataDog/datadog-agent'
 

omnibus/config/software/datadog-iot-agent.rb

@@ -10,7 +10,7 @@
 
 source path: '..',
        options: {
-         exclude: ["**/.cache/**/*"],
+         exclude: ["**/.cache/**/*", "**/.git/fsmonitor--daemon.ipc"],
        }
 relative_path 'src/github.com/DataDog/datadog-agent'
 

omnibus/config/software/datadog-otel-agent.rb

@@ -15,6 +15,7 @@
          exclude: [
            "**/.cache/**/*",
            "**/testdata/**/*",
+           "**/.git/fsmonitor--daemon.ipc",
          ],
        }
 relative_path 'src/github.com/DataDog/datadog-agent'

omnibus/config/software/existing-agent-package.rb

@@ -2,6 +2,9 @@
 
 description 'A previously built artifact, unpacked'
 
+require 'fileutils'
+require 'shellwords'
+
 always_build true
 
 source_url = ENV['OMNIBUS_REPACKAGE_SOURCE_URL']
@@ -11,5 +14,25 @@
        target_filename: target_package
 
 build do
-  command "dpkg --unpack #{target_package}"
+  destdir = ENV["OMNIBUS_BASE_DIR"] || "/"
+
+  block "Prepare package extraction root" do
+    FileUtils.mkdir_p(destdir)
+  end
+
+  command "dpkg-deb -x #{Shellwords.escape(target_package)} #{Shellwords.escape(destdir)}"
+
+  if destdir != "/"
+    staged_install_dir = File.join(destdir, install_dir.sub(%r{\A/+}, ""))
+
+    # GNU `chmod -R` skips symlinks; `FileUtils.chmod_R` with a symbolic mode stats each
+    # entry and raises ENOENT on the package's absolute symlinks, which dangle until the
+    # install dir is repopulated.
+    command "chmod -R u+rwX #{Shellwords.escape(staged_install_dir)}"
+
+    block "Populate install directory from extracted package" do
+      FileUtils.mkdir_p(install_dir)
+      FileUtils.cp_r("#{staged_install_dir}/.", install_dir)
+    end
+  end
 end

omnibus/config/software/installer.rb

@@ -11,7 +11,7 @@
 
 source path: '..',
        options: {
-         exclude: ["**/.cache/**/*", "**/testdata/**/*"],
+         exclude: ["**/.cache/**/*", "**/testdata/**/*", "**/.git/fsmonitor--daemon.ipc"],
        }
 relative_path 'src/github.com/DataDog/datadog-agent'
 

omnibus/lib/project_extension.rb

@@ -280,6 +280,35 @@ def notarize_and_staple
 
   Packager::PKG.prepend PackagerPKGNotarizer
 
+  # Repackaged builds may extract external package files under OMNIBUS_BASE_DIR
+  # because non-root dev environments cannot write paths like /usr/bin. Keep the
+  # declared extra_package_file path as the final package path, but source missing
+  # absolute files from the staged root when available.
+  module PackagerExtraPackageFileStagedRoot
+    def copy_file(source, destination)
+      staged_source = staged_extra_package_source(source)
+      if staged_source != source.to_s && File.directory?(staged_source)
+        FileUtils.cp_r(staged_source.chomp("/"), destination)
+      else
+        super(staged_source, destination)
+      end
+    end
+
+    private
+
+    def staged_extra_package_source(source)
+      base_dir = ENV["OMNIBUS_BASE_DIR"]
+      source = source.to_s
+      return source if base_dir.nil? || base_dir.empty? || !source.start_with?("/")
+
+      staged_source = File.join(base_dir, source.sub(%r{\A/+}, ""))
+      File.exist?(staged_source) ? staged_source : source
+    end
+  end
+
+  Packager::DEB.prepend PackagerExtraPackageFileStagedRoot
+  Packager::RPM.prepend PackagerExtraPackageFileStagedRoot
+
   # The legacy Omnibus RPM packager builds its file list by globbing the staging
   # tree. When Omnibus stages an external extra_package_file, it creates parent
   # directories in that tree as an implementation detail. Without filtering,

tasks/omnibus.py

@@ -1,6 +1,7 @@
 import hashlib
 import os
 import re
+import shutil
 import subprocess
 import sys
 import tempfile
@@ -64,6 +65,15 @@ def omnibus_run_task(
             ctx.run(cmd.format(**args), env=env, replace_env=True, err_stream=sys.stdout)
 
 
+def _clear_agent_install_directory(agent_path):
+    with os.scandir(agent_path) as entries:
+        for entry in entries:
+            if entry.is_dir(follow_symlinks=False):
+                shutil.rmtree(entry.path)
+            else:
+                os.unlink(entry.path)
+
+
 def bundle_install_omnibus(ctx, gem_path=None, env=None, max_try=2):
     with ctx.cd("omnibus"):
         # make sure bundle install starts from a clean state
@@ -462,9 +472,7 @@ def build_repackaged_agent(ctx, log_level="info"):
         ):
             raise Exit("Operation cancelled")
 
-        import shutil
-
-        shutil.rmtree("/opt/datadog-agent")
+        _clear_agent_install_directory(agent_path)
 
     architecture = ctx.run("dpkg --print-architecture", hide=True).stdout.strip()
 
@@ -485,6 +493,10 @@ def build_repackaged_agent(ctx, log_level="info"):
 
     env['OMNIBUS_REPACKAGE_SOURCE_URL'] = f"https://apt.datad0g.com/{latest_package.filename}"
     env['OMNIBUS_REPACKAGE_SOURCE_SHA256'] = latest_package.sha256
+    base_dir = _resolve_omnibus_path_override(None, "OMNIBUS_BASE_DIR")
+    if base_dir:
+        env['OMNIBUS_BASE_DIR'] = base_dir
+
     # Set up compiler flags (assumes an environment based on our glibc-targeting toolchains)
     if architecture == "amd64":
         env.update(
@@ -509,7 +521,7 @@ def build_repackaged_agent(ctx, log_level="info"):
         ctx,
         "build",
         "agent",
-        base_dir=None,
+        base_dir=base_dir,
         env=env,
         log_level=log_level,
         cache_dir=_resolve_omnibus_path_override(None, "OMNIBUS_CACHE_DIR"),