Merge software definitions for integration installation for py2 and p…

…y3 (#21041)
DataDog · Nov 29, 2023 · c581546 · c581546
1 parent 18a7f5c
commit c581546
Show file tree

Hide file tree

Showing 9 changed files with 527 additions and 986 deletions.
diff --git a/omnibus/config/patches/datadog-agent-integrations-py3/remove-maxfile-maxpath-psutil.patch b/omnibus/config/patches/datadog-agent-integrations-py3/remove-maxfile-maxpath-psutil.patch
diff --git a/...rations-py2/create-regex-at-runtime.patch → ...ntegrations/create-regex-at-runtime.patch b/...rations-py2/create-regex-at-runtime.patch → ...ntegrations/create-regex-at-runtime.patch
diff --git a/...s-py2/remove-maxfile-maxpath-psutil.patch → ...tions/remove-maxfile-maxpath-psutil.patch b/...s-py2/remove-maxfile-maxpath-psutil.patch → ...tions/remove-maxfile-maxpath-psutil.patch
diff --git a/omnibus/config/projects/agent.rb b/omnibus/config/projects/agent.rb
@@ -182,13 +182,13 @@
 
 if with_python_runtime? "2"
   dependency 'pylint2'
-  dependency 'datadog-agent-integrations-py2'
 end
 
-if with_python_runtime? "3"
-  dependency 'datadog-agent-integrations-py3'
+if with_python_runtime? "3" or with_python_runtime? "2"
+  dependency 'datadog-agent-integrations'
 end
 
+
 if linux_target?
   dependency 'datadog-security-agent-policies'
 end