Merge pull request wolfi-dev#68428 from AmberArcadia/datadog-agent-fixes

Datadog-agent integration commit bump and gate

Author: dnegreira

datadog-agent.yaml

@@ -3,7 +3,7 @@ package:
   # This package has two git checkouts. For each new release, the commit SHA for
   # DataDog/integrations-core must also be updated.
   version: "7.71.1"
-  epoch: 0 # GHSA-4xh5-x5gv-qwph
+  epoch: 1
   description: "Collect events and metrics from your hosts that send data to Datadog."
   copyright:
     - license: Apache-2.0
@@ -124,10 +124,10 @@ pipeline:
   # these won't leak into the package.
   - runs: |
       # install `invoke` and its dependencies
-      python${{vars.python-version}} -m pip install invoke requests toml pyyaml packaging codeowners
+      python${{vars.python-version}} -m pip install invoke requests toml pyyaml packaging codeowners --root-user-action ignore
 
       # install `gitlab`
-      python${{vars.python-version}} -m pip install python-gitlab
+      python${{vars.python-version}} -m pip install python-gitlab --root-user-action ignore
 
   - uses: go/bump
     with:
@@ -381,10 +381,25 @@ subpackages:
             with:
               repository: https://github.com/DataDog/integrations-core
               branch: ${{vars.datadog-major-minor-x}} # 7.x.y
-              expected-commit: 3040577a9e2f266b8202294db17da354dcb41c47 # needs to be updated with each new release
+              expected-commit: 154195b209b2f79add4038fdcf082181413fd66b # needs to be updated with each new release
+          - name: Verify expected-commit is latest
+            runs: |
+              # Check if the expected-commit matches the latest commit on the branch
+              # Extract the current commit from HEAD (which git-checkout set to expected-commit)
+              EXPECTED_COMMIT=$(git rev-parse HEAD)
+              LATEST_COMMIT=$(git ls-remote https://github.com/DataDog/integrations-core refs/heads/${{vars.datadog-major-minor-x}} | cut -f1)
+
+              if [ "$EXPECTED_COMMIT" != "$LATEST_COMMIT" ]; then
+                echo "ERROR: expected-commit ($EXPECTED_COMMIT) is not the latest commit on branch ${{vars.datadog-major-minor-x}}"
+                echo "Latest commit is: $LATEST_COMMIT"
+                echo "Please update the expected-commit in datadog-agent.yaml"
+                exit 1
+              fi
+
+              echo "Verified: expected-commit matches the latest commit on branch ${{vars.datadog-major-minor-x}}"
           - uses: patch
             with:
-              patches: /home/build/int-core-datadog_checks_dev-pyproject-toml.patch /home/build/int-core-datadog_checks_base-pyproject-toml.patch /home/build/int-core-mysql-hatch-toml.patch  /home/build/int-core-singlestore-hatch-toml.patch  /home/build/int-core-agent_requirements-in.patch  /home/build/int-core-requests-upgrade.patch
+              patches: /home/build/int-core-datadog_checks_dev-pyproject-toml.patch /home/build/int-core-mysql-hatch-toml.patch  /home/build/int-core-singlestore-hatch-toml.patch
           - runs: |
               # This is needed to work around the error "ValueError: ZIP does not support timestamps before 1980"
               SOURCE_DATE_EPOCH=315532800