Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 7.62.x] [SBOM] Disable RPM archive trivy analyzer #32803

Merged
merged 1 commit into from
Jan 10, 2025

Conversation

agent-platform-auto-pr[bot]
Copy link
Contributor

Backport 9d995bc from #32782.


<!--

  • Contributors are encouraged to read our CONTRIBUTING documentation.
  • Both Contributor and Reviewer Checklists are available at https://datadoghq.dev/datadog-agent/guidelines/contributing/#pull-requests.
  • The pull request:
    • Should only fix one issue or add one feature at a time.
    • Must update the test suite for the relevant functionality.
    • Should pass all status checks before being reviewed or merged.
  • Commit titles should be prefixed with general area of pull request's change.
  • Please fill the below sections if possible with relevant information or links.
    -->

What does this PR do?

When some RPM files are found on a Ubuntu machine, the Cyclone DX will have
both RPM and DPKG components, which makes the BE unhappy.

Motivation

Describe how you validated your changes

<!--
Validate your changes before merge, ensuring that:

  • Your PR is tested by static / unit / integrations / e2e tests
  • Your PR description details which e2e tests cover your changes, if any
  • The PR description contains details of how you validated your changes. If you validated changes manually and not through automated tests, add context on why automated tests did not fit your changes validation.

If you want additional validation by a second person, you can ask reviewers to do it. Describe how to set up an environment for manual tests in the PR description. Manual validation is expected to happen on every commit before merge.

Any manual validation step should then map to an automated test. Manual validation should not substitute automation, minus exceptions not supported by test tooling yet.
-->

Possible Drawbacks / Trade-offs

Additional Notes

<!--

  • Anything else we should know when reviewing?
  • Include benchmarking information here whenever possible.
  • Include info about alternatives that were considered and why the proposed
    version was chosen.
    -->

@agent-platform-auto-pr agent-platform-auto-pr bot added changelog/no-changelog team/agent-security backport bot short review PR is simple enough to be reviewed quickly qa/rc-required Only for a PR that requires validation on the Release Candidate labels Jan 9, 2025
@agent-platform-auto-pr agent-platform-auto-pr bot requested review from a team as code owners January 9, 2025 09:59
@agent-platform-auto-pr
Copy link
Contributor Author

[Fast Unit Tests Report]

On pipeline 52522609 (CI Visibility). The following jobs did not run any unit tests:

Jobs:
  • tests_flavor_dogstatsd_deb-x64
  • tests_flavor_heroku_deb-x64
  • tests_flavor_iot_deb-x64
  • tests_windows-x64

If you modified Go files and expected unit tests to run in these jobs, please double check the job logs. If you think tests should have been executed reach out to #agent-devx-help

@agent-platform-auto-pr
Copy link
Contributor Author

Test changes on VM

Use this command from test-infra-definitions to manually test this PR changes on a VM:

inv aws.create-vm --pipeline-id=52522609 --os-family=ubuntu

Note: This applies to commit b4496f3

@agent-platform-auto-pr
Copy link
Contributor Author

Uncompressed package size comparison

Comparison with ancestor 234771bfeff3cdf8a1209e4be7be4f069346b3b1

Diff per package
package diff status size ancestor threshold
datadog-heroku-agent-amd64-deb 0.07MB ⚠️ 505.28MB 505.21MB 70.00MB
datadog-agent-x86_64-rpm 0.02MB ⚠️ 1200.36MB 1200.34MB 140.00MB
datadog-agent-x86_64-suse 0.02MB ⚠️ 1200.36MB 1200.34MB 140.00MB
datadog-iot-agent-x86_64-rpm 0.01MB ⚠️ 113.42MB 113.42MB 10.00MB
datadog-iot-agent-x86_64-suse 0.01MB ⚠️ 113.42MB 113.42MB 10.00MB
datadog-iot-agent-amd64-deb 0.01MB ⚠️ 113.35MB 113.35MB 10.00MB
datadog-iot-agent-arm64-deb 0.01MB ⚠️ 108.82MB 108.81MB 10.00MB
datadog-iot-agent-aarch64-rpm 0.00MB 108.89MB 108.88MB 10.00MB
datadog-dogstatsd-amd64-deb 0.00MB 78.57MB 78.57MB 10.00MB
datadog-dogstatsd-arm64-deb 0.00MB 55.77MB 55.77MB 10.00MB
datadog-dogstatsd-x86_64-rpm -0.00MB 78.65MB 78.65MB 10.00MB
datadog-dogstatsd-x86_64-suse -0.00MB 78.65MB 78.65MB 10.00MB
datadog-agent-amd64-deb -0.01MB 1191.05MB 1191.05MB 140.00MB
datadog-agent-aarch64-rpm -0.02MB 944.59MB 944.61MB 140.00MB
datadog-agent-arm64-deb -0.05MB 935.29MB 935.34MB 140.00MB

Decision

⚠️ Warning

@alopezz alopezz merged commit 540d82d into 7.62.x Jan 10, 2025
298 checks passed
@alopezz alopezz deleted the backport-32782-to-7.62.x branch January 10, 2025 09:40
@github-actions github-actions bot added this to the 7.62.0 milestone Jan 10, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport bot changelog/no-changelog qa/rc-required Only for a PR that requires validation on the Release Candidate short review PR is simple enough to be reviewed quickly team/agent-security
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants