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.

Sign up for GitHub

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

Revert "[ACIX-548] Migrated trace agent integration tests on agent6" #34521

Draft
wants to merge 5 commits into
base: 6.53.x
Choose a base branch
from
Draft

Revert "[ACIX-548] Migrated trace agent integration tests on agent6" #34521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f9e5196
Revert "[ACIX-548] Migrated trace agent integration tests on agent6 (…
CelianR Feb 27, 2025
bdeb1e7
Trigger jobs
CelianR Feb 27, 2025
4d82033
Dont skip
CelianR Feb 27, 2025
26a0b6f
empty
CelianR Feb 28, 2025
7cd1b6b
When always
CelianR Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitlab/JOBOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@ 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
5 changes: 4 additions & 1 deletion .gitlab/e2e/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,10 @@ new-e2e-containers:
# TODO once images are deployed to ECR for dev branches, update
#.on_main_or_rc_and_no_skip_e2e adding on_dev_branch_manual rules
# and move rules to template
rules: !reference [.on_container_or_e2e_changes_or_manual]
# TODO A: Restore rules
# rules: !reference [.on_container_or_e2e_changes_or_manual]
rules:
- when: always
variables:
TARGETS: ./tests/containers
TEAM: container-integrations
Expand Down
1 change: 0 additions & 1 deletion .gitlab/integration_test/include.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@

include:
- .gitlab/integration_test/windows.yml
- .gitlab/integration_test/linux.yml
18 changes: 0 additions & 18 deletions .gitlab/integration_test/linux.yml
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions tasks/go_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
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 @@ -490,6 +491,7 @@ 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
Loading