Skip to content

Commit

Permalink
[mq] working branch - merge 89bbbc5 on top of 6.53.x at 6135518
Browse files Browse the repository at this point in the history
{"baseBranch":"6.53.x","baseCommit":"6135518813e599ddc5d2e7b9c7632ae1b9b613e1","createdAt":"2025-02-25T09:19:32.204475Z","headSha":"89bbbc519afac9ca9fb234d80e64de4507e15fe8","id":"9f1fd2dd-8ddc-442e-8712-e7303158480f","priority":"200","pullRequestNumber":"34238","queuedAt":"2025-02-25T12:44:08.558585Z","status":"STATUS_QUEUED"}
  • Loading branch information
dd-mergequeue[bot] authored Feb 25, 2025
2 parents fe6c793 + 89bbbc5 commit 235ec7c
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitlab/JOBOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ docker_image_build_otel @DataDog/opentelemetry
datadog_otel_components_ocb_build @DataDog/opentelemetry
agent_integration_tests @DataDog/container-integrations
docker_integration_tests @DataDog/container-integrations
trace_agent_integration_tests @DataDog/agent-apm

# Functional test
serverless_cold_start_performance-deb_x64 @DataDog/serverless
Expand Down
1 change: 1 addition & 0 deletions .gitlab/integration_test/include.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@

include:
- .gitlab/integration_test/windows.yml
- .gitlab/integration_test/linux.yml
18 changes: 18 additions & 0 deletions .gitlab/integration_test/linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
.integration_tests_deb:
stage: integration_test
needs: ["go_deps", "go_tools_deps"]
rules:
- !reference [.except_mergequeue]
- when: on_success
before_script:
- !reference [.retrieve_linux_go_deps]
- !reference [.retrieve_linux_go_tools_deps]

trace_agent_integration_tests:
extends: .integration_tests_deb
image: registry.ddbuild.io/ci/datadog-agent-buildimages/deb_x64$DATADOG_AGENT_BUILDIMAGES_SUFFIX:$DATADOG_AGENT_BUILDIMAGES
tags: ["arch:amd64"]
timeout: 50m
retry: 2
script:
- inv -e trace-agent.integration-tests --race
2 changes: 0 additions & 2 deletions tasks/go_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
from tasks.libs.junit_upload_core import enrich_junitxml, produce_junit_tar
from tasks.modules import GoModule
from tasks.test_core import ModuleTestResult, process_input_args, process_module_results, test_core
from tasks.trace_agent import integration_tests as trace_integration_tests

PROFILE_COV = "coverage.out"
TMP_PROFILE_COV_PREFIX = "coverage.out.rerun"
Expand Down Expand Up @@ -491,7 +490,6 @@ def integration_tests(ctx, install_deps=False, race=False, remote_docker=False,
lambda: agent_integration_tests(ctx, install_deps, race, remote_docker),
lambda: dsd_integration_tests(ctx, install_deps, race, remote_docker),
lambda: dca_integration_tests(ctx, install_deps, race, remote_docker),
lambda: trace_integration_tests(ctx, install_deps, race),
]
for t in tests:
try:
Expand Down

0 comments on commit 235ec7c

Please sign in to comment.