Skip to content

[Agent6] Revert test-infra-bump to fix new-e2e-containers#35122

Merged
dd-mergequeue[bot] merged 20 commits into6.53.xfrom
nschweitzer/revert_e2e
Mar 26, 2025
Merged

[Agent6] Revert test-infra-bump to fix new-e2e-containers#35122
dd-mergequeue[bot] merged 20 commits into6.53.xfrom
nschweitzer/revert_e2e

Conversation

@chouetz
Copy link
Member

@chouetz chouetz commented Mar 14, 2025 •
edited
Loading

What does this PR do?

  • Revert commit bumping test-infra-definition
  • increase the sleep threshold for windows containers in EKS test
  • align CODEOWNERS and slack maps

Motivation

Set the Agent6 branch to a stable state
https://datadoghq.atlassian.net/browse/ACIX-544

Describe how you validated your changes

E2E tests are green

Possible Drawbacks / Trade-offs

Additional Notes

@chouetz chouetz requested review from a team as code owners March 14, 2025 13:24
@chouetz chouetz added changelog/no-changelog No changelog entry needed qa/no-code-change No code change in Agent code requiring validation labels Mar 14, 2025
@pr-commenter
Copy link

pr-commenter bot commented Mar 14, 2025 •
edited
Loading

Test changes on VM

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

inv create-vm --pipeline-id=59925810 --os-family=ubuntu

@chouetz
Copy link
Member Author

chouetz commented Mar 17, 2025

/trigger-ci --variable RUN_ALL_BUILDS=true --variable RUN_KITCHEN_TESTS=true --variable RUN_E2E_TESTS=on --variable RUN_UNIT_TESTS=on --variable RUN_KMT_TESTS=on

@dd-devflow
Copy link

dd-devflow bot commented Mar 17, 2025 •
edited
Loading

View all feedbacks in Devflow UI.
2025-03-17 09:21:15 UTC ℹ️ Start processing command /trigger-ci --variable RUN_ALL_BUILDS=true --variable RUN_KITCHEN_TESTS=true --variable RUN_E2E_TESTS=on --variable RUN_UNIT_TESTS=on --variable RUN_KMT_TESTS=on

2025-03-17 09:21:37 UTC ℹ️ Gitlab pipeline started

Started pipeline #58997323

@chouetz chouetz requested a review from a team as a code owner March 21, 2025 07:43
@chouetz
Copy link
Member Author

chouetz commented Mar 21, 2025

/trigger-ci --variable RUN_ALL_BUILDS=true --variable RUN_KITCHEN_TESTS=true --variable RUN_E2E_TESTS=on --variable RUN_UNIT_TESTS=on --variable RUN_KMT_TESTS=on

@dd-devflow
Copy link

dd-devflow bot commented Mar 21, 2025 •
edited
Loading

View all feedbacks in Devflow UI.
2025-03-21 08:53:34 UTC ℹ️ Start processing command /trigger-ci --variable RUN_ALL_BUILDS=true --variable RUN_KITCHEN_TESTS=true --variable RUN_E2E_TESTS=on --variable RUN_UNIT_TESTS=on --variable RUN_KMT_TESTS=on

2025-03-21 08:53:54 UTC ℹ️ Gitlab pipeline started

Started pipeline #59555964

@chouetz chouetz requested a review from a team as a code owner March 21, 2025 13:02
@chouetz chouetz requested a review from a team March 21, 2025 13:02
@chouetz chouetz requested review from a team as code owners March 21, 2025 14:55
@chouetz chouetz requested a review from a team March 21, 2025 14:55
@chouetz chouetz requested review from a team as code owners March 21, 2025 14:55
@chouetz chouetz requested review from FlorianVeaux, Jakobovski and jade-guiton-dd and removed request for a team March 21, 2025 14:55
@cit-pr-commenter
Copy link

cit-pr-commenter bot commented Mar 21, 2025 •
edited
Loading

Go Package Import Differences

Baseline: 00f113a
Comparison: 0124838

binaryosarchchange
agentlinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
agentlinuxarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
agentwindowsamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
agentwindows386
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
agentdarwinamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
agentdarwinarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
iot-agentlinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
iot-agentlinuxarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
heroku-agentlinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
cluster-agentlinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
cluster-agentlinuxarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
cluster-agent-cloudfoundrylinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
cluster-agent-cloudfoundrylinuxarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
dogstatsdlinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
dogstatsdlinuxarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
process-agentlinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
process-agentlinuxarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
process-agentwindowsamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
process-agentdarwinamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
process-agentdarwinarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
heroku-process-agentlinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
security-agentlinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
security-agentlinuxarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
serverlesslinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
serverlesslinuxarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
system-probelinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
system-probelinuxarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
system-probewindowsamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
trace-agentlinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
trace-agentlinuxarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
trace-agentwindowsamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
trace-agentwindows386
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
trace-agentdarwinamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
trace-agentdarwinarm64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional
heroku-trace-agentlinuxamd64
+1, -1 
-github.com/DataDog/datadog-agent/pkg/util/option
+github.com/DataDog/datadog-agent/pkg/util/optional

@chouetz chouetz changed the title [Agent6] Tentative to revert test-infra-bump to fix new-e2e-containers [Agent6] Revert test-infra-bump to fix new-e2e-containers Mar 25, 2025
@chouetz chouetz force-pushed the nschweitzer/revert_e2e branch from bc97418 to 0124838 Compare March 25, 2025 16:53
CelianR
CelianR approved these changes Mar 26, 2025
View reviewed changes
Copy link
Contributor

@CelianR CelianR left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a description with the commit you reverted?

@chouetz
Copy link
Member Author

chouetz commented Mar 26, 2025

/merge

@dd-devflow
Copy link

dd-devflow bot commented Mar 26, 2025 •
edited
Loading

View all feedbacks in Devflow UI.
2025-03-26 10:03:32 UTC ℹ️ Start processing command /merge

2025-03-26 10:03:37 UTC ℹ️ MergeQueue: pull request added to the queue

The expected merge time in 6.53.x is approximately 43m (p90).

2025-03-26 10:42:40 UTC ℹ️ MergeQueue: This merge request was merged

@dd-mergequeue dd-mergequeue bot merged commit f9508a2 into 6.53.x Mar 26, 2025
239 of 240 checks passed
@dd-mergequeue dd-mergequeue bot deleted the nschweitzer/revert_e2e branch March 26, 2025 10:42
@github-actions github-actions bot added this to the 6.53.0 milestone Mar 26, 2025
chouetz added a commit that referenced this pull request Jul 22, 2025
@chouetz
Revert "[Agent6] Revert test-infra-bump to fix new-e2e-containers (#3…
c500a1f 
…5122)"

This reverts commit f9508a2.
chouetz added a commit that referenced this pull request Aug 26, 2025
@chouetz
Revert "[Agent6] Revert test-infra-bump to fix new-e2e-containers (#3…
608b4a9 
…5122)"

This reverts commit f9508a2.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CelianR CelianR CelianR approved these changes

@misteriaud misteriaud Awaiting requested review from misteriaud misteriaud is a code owner automatically assigned from DataDog/agent-runtimes

@rahulkaukuntla rahulkaukuntla Awaiting requested review from rahulkaukuntla rahulkaukuntla is a code owner automatically assigned from DataDog/agent-configuration

@Jakobovski Jakobovski Awaiting requested review from Jakobovski Jakobovski was automatically assigned from DataDog/networks

@FlorianVeaux FlorianVeaux Awaiting requested review from FlorianVeaux FlorianVeaux is a code owner automatically assigned from DataDog/ndm-core

@jade-guiton-dd jade-guiton-dd Awaiting requested review from jade-guiton-dd jade-guiton-dd is a code owner automatically assigned from DataDog/opentelemetry

Assignees

No one assigned

Labels

changelog/no-changelog No changelog entry needed component/system-probe qa/no-code-change No code change in Agent code requiring validation

Projects

None yet

Milestone

6.53.0

Development

Successfully merging this pull request may close these issues.

4 participants

@chouetz @CelianR @pgimalac @KSerrania