Merge #34245: Fix agent's version-manifests

omnibus/config/projects/agent.rb

@@ -261,6 +261,15 @@
   dependency "init-scripts-agent"
 end
 
+# version manifest is based on the built softwares.
+# When packaging, we only build 2, which causes very incomplete manifests
+# to be generated. However, we build correct ones during the build stage, which
+# gets extracted in the correct location in the "package-artifacts" recipe.
+# By disabling manifest generation during packaging jobs, we ensure the manifest we
+# will package is the correct one
+disable_version_manifest do_package
+
+
 if linux_target?
   extra_package_file "#{output_config_dir}/etc/datadog-agent/"
   extra_package_file '/usr/bin/dd-agent'

release.json

@@ -26,7 +26,7 @@
     },
     "nightly-a7": {
         "OMNIBUS_SOFTWARE_VERSION": "d4a12d8a009e1c497e5e740e1ea5c8d23d6864ca",
-        "OMNIBUS_RUBY_VERSION": "49ba11883cdf5692a39095d1a036a1ef59a25210",
+        "OMNIBUS_RUBY_VERSION": "f614b2ccc11250b836f346007da49226e198b28e",
         "JMXFETCH_VERSION": "0.49.6",
         "JMXFETCH_HASH": "f06bdac1f8ec41daf9b9839ac883f1865a068b04810ea82197b8a6afb9369cb9",
         "MACOS_BUILD_VERSION": "master",

releasenotes/notes/fix_version_manifests-0f8a359ed1f58962.yaml

@@ -0,0 +1,11 @@
+# Each section from every release note are combined when the
+# CHANGELOG.rst is rendered. So the text needs to be worded so that
+# it does not depend on any information only available in another
+# section. This may mean repeating some details, but each section
+# must be readable independently of the other.
+#
+# Each section note must be formatted as reStructuredText.
+---
+fixes:
+  - |
+    version-manifest.json and version-manifest.txt files now correctly reflect the packages content.