Fix distutils hack error (#35011)

Author: CelianR

.circleci/config.yml

@@ -15,7 +15,7 @@ experimental:
 templates:
   job_template: &job_template
     docker:
-      - image: gcr.io/datadoghq/agent-circleci-runner:v57606056-e4f2ccf9
+      - image: gcr.io/datadoghq/agent-circleci-runner:v58028397-44fec785
         environment:
           USE_SYSTEM_LIBS: "1"
     working_directory: /go/src/github.com/DataDog/datadog-agent

.gitlab-ci.yml

@@ -168,47 +168,47 @@ variables:
   # To use images from datadog-agent-buildimages dev branches, set the corresponding
   # SUFFIX variable to _test_only
   DATADOG_AGENT_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BUILDIMAGES: v57956792-9c6a3311
+  DATADOG_AGENT_BUILDIMAGES: v58028397-44fec785
   DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_WINBUILDIMAGES: v57956792-9c6a3311
+  DATADOG_AGENT_WINBUILDIMAGES: v58028397-44fec785
   DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_ARMBUILDIMAGES: v57956792-9c6a3311
+  DATADOG_AGENT_ARMBUILDIMAGES: v58028397-44fec785
   DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v57956792-9c6a3311
+  DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v58028397-44fec785
   DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: ""
-  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v57956792-9c6a3311
+  DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v58028397-44fec785
   # New images to enable different version per image - not used yet
-  CI_IMAGE_BTF_GEN: v57956792-9c6a3311
+  CI_IMAGE_BTF_GEN: v58028397-44fec785
   CI_IMAGE_BTF_GEN_SUFFIX: ""
-  CI_IMAGE_DEB_X64: v57956792-9c6a3311
+  CI_IMAGE_DEB_X64: v58028397-44fec785
   CI_IMAGE_DEB_X64_SUFFIX: ""
-  CI_IMAGE_DEB_ARM64: v57956792-9c6a3311
+  CI_IMAGE_DEB_ARM64: v58028397-44fec785
   CI_IMAGE_DEB_ARM64_SUFFIX: ""
-  CI_IMAGE_DEB_ARMHF: v57956792-9c6a3311
+  CI_IMAGE_DEB_ARMHF: v58028397-44fec785
   CI_IMAGE_DEB_ARMHF_SUFFIX: ""
-  CI_IMAGE_DD_AGENT_TESTING: v57956792-9c6a3311
+  CI_IMAGE_DD_AGENT_TESTING: v58028397-44fec785
   CI_IMAGE_DD_AGENT_TESTING_SUFFIX: ""
-  CI_IMAGE_DOCKER_X64: v57956792-9c6a3311
+  CI_IMAGE_DOCKER_X64: v58028397-44fec785
   CI_IMAGE_DOCKER_X64_SUFFIX: ""
-  CI_IMAGE_DOCKER_ARM64: v57956792-9c6a3311
+  CI_IMAGE_DOCKER_ARM64: v58028397-44fec785
   CI_IMAGE_DOCKER_ARM64_SUFFIX: ""
-  CI_IMAGE_GITLAB_AGENT_DEPLOY: v57956792-9c6a3311
+  CI_IMAGE_GITLAB_AGENT_DEPLOY: v58028397-44fec785
   CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_17_X64: v57956792-9c6a3311
+  CI_IMAGE_LINUX_GLIBC_2_17_X64: v58028397-44fec785
   CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: ""
-  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v57956792-9c6a3311
+  CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v58028397-44fec785
   CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_X64: v57956792-9c6a3311
+  CI_IMAGE_SYSTEM_PROBE_X64: v58028397-44fec785
   CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: ""
-  CI_IMAGE_SYSTEM_PROBE_ARM64: v57956792-9c6a3311
+  CI_IMAGE_SYSTEM_PROBE_ARM64: v58028397-44fec785
   CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_X64: v57956792-9c6a3311
+  CI_IMAGE_RPM_X64: v58028397-44fec785
   CI_IMAGE_RPM_X64_SUFFIX: ""
-  CI_IMAGE_RPM_ARM64: v57956792-9c6a3311
+  CI_IMAGE_RPM_ARM64: v58028397-44fec785
   CI_IMAGE_RPM_ARM64_SUFFIX: ""
-  CI_IMAGE_RPM_ARMHF: v57956792-9c6a3311
+  CI_IMAGE_RPM_ARMHF: v58028397-44fec785
   CI_IMAGE_RPM_ARMHF_SUFFIX: ""
-  CI_IMAGE_WIN_LTSC2022_X64: v57956792-9c6a3311
+  CI_IMAGE_WIN_LTSC2022_X64: v58028397-44fec785
   CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: ""
 
   DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded

.gitlab/internal_kubernetes_deploy/internal_kubernetes_deploy.yml

@@ -66,8 +66,6 @@ notify-slack:
   script:
     - export SDM_JWT=$(vault read -field=token identity/oidc/token/sdm)
     - python3 -m pip install "git+https://github.com/DataDog/datadog-agent-dev.git@v$(cat .dda/version)"
-    # NOTE: The following command is a workaround to avoid this error due to conda when installing requirements: "ModuleNotFoundError: No module named '_distutils_hack'"
-    - python3 -m pip install -U setuptools -c https://github.com/DataDog/datadog-agent-buildimages/raw/refs/heads/main/requirements/constraints.txt
     - dda self dep sync -f legacy-tasks -f legacy-notifications
     - SLACK_DATADOG_AGENT_BOT_TOKEN=$($CI_PROJECT_DIR/tools/ci/fetch_secret.sh $SLACK_AGENT token) || exit $?; export SLACK_DATADOG_AGENT_BOT_TOKEN
     - dda inv pipeline.changelog ${CI_COMMIT_SHORT_SHA} || exit $?