Skip to content

Automatic retry ASM integration tests under failure #8011

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

Merged
NachoEchevarria merged 5 commits into from
Jan 12, 2026
Merged

Automatic retry ASM integration tests under failure #8011

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
d6c35ec
Retry failing tests
NachoEchevarria Dec 24, 2025
7213fa7
Do not include integration_tests_windows_iis
NachoEchevarria Dec 24, 2025
137e52a
Dummy ASM change to trigger tests
NachoEchevarria Dec 24, 2025
48127d7
Merge branch 'master' into nacho/RetryASMIntegrationTests
NachoEchevarria Dec 26, 2025
fe1020a
Merge branch 'master' into nacho/RetryASMIntegrationTests
NachoEchevarria Jan 7, 2026
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
36 changes: 34 additions & 2 deletions .azure-pipelines/ultimate-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1710,12 +1710,25 @@ stages:
SampleName: $(IntegrationTestSampleName)

- script: tracer\build.cmd RunIntegrationTests RunWindowsRegressionTests -Framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)
displayName: Run integration tests
displayName: Run integration tests (Tracer)
condition: ne(variables['area'], 'ASM')
env:
DD_LOGGER_DD_API_KEY: $(ddApiKey)
enable_crash_dumps: true
Filter: $(IntegrationTestFilter)
SampleName: $(IntegrationTestSampleName)
Area: $(area)

- script: tracer\build.cmd RunIntegrationTests RunWindowsRegressionTests -Framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled)
displayName: Run integration tests (ASM)
condition: eq(variables['area'], 'ASM')
retryCountOnTaskFailure: 2
Copy link
Copy Markdown
Member

@andrewlock andrewlock Jan 9, 2026

Choose a reason for hiding this comment

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

Gah, it's so ugly that we have to split these jobs, but I think that's the best we can do 😅

env:
DD_LOGGER_DD_API_KEY: $(ddApiKey)
enable_crash_dumps: true
Filter: $(IntegrationTestFilter)
SampleName: $(IntegrationTestSampleName)
Area: $(area)

# TODO: Re-enable test-agent.windows once VM images are updated (hitting rate limits for docker)
# - script: docker compose -f docker-compose.windows.yml down
Expand Down Expand Up @@ -2272,7 +2285,26 @@ stages:
-e SampleName=$(IntegrationTestSampleName) \
-e Area=$(area) \
IntegrationTests
displayName: docker-compose run IntegrationTests
displayName: docker-compose run IntegrationTests (Tracer)
condition: ne(variables['area'], 'ASM')
env:
DD_LOGGER_DD_API_KEY: $(ddApiKey)
baseImage: $(baseImage) # for interpolation in the docker-compose file

- script: |
docker-compose -f docker-compose.yml -p $(DockerComposeProjectName) \
run --no-deps --rm \
-e baseImage=$(baseImage) \
-e framework=$(publishTargetFramework) \
-e CodeCoverageEnabled=$(CodeCoverageEnabled) \
-e IncludeTestsRequiringDocker=false \
-e Filter=$(IntegrationTestFilter) \
-e SampleName=$(IntegrationTestSampleName) \
-e Area=$(area) \
IntegrationTests
displayName: docker-compose run IntegrationTests (ASM)
condition: eq(variables['area'], 'ASM')
retryCountOnTaskFailure: 2
env:
DD_LOGGER_DD_API_KEY: $(ddApiKey)
baseImage: $(baseImage) # for interpolation in the docker-compose file
Expand Down
2 changes: 1 addition & 1 deletion tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetWebApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public AspNetWebApi(IisFixture iisFixture, ITestOutputHelper output, bool classi
public Task TestSecurity(string test, string url, string body)
{
// if blocking is enabled, request stops before reaching asp net mvc integrations intercepting before action methods, so no more spans are generated
// NOTE: by integrating the latest version of the WAF, blocking was disabled, as it does not support blocking yet
// NOTE: by integrating the latest version of the WAF, blocking was disabled, as it does not support blocking yet.
var sanitisedUrl = VerifyHelper.SanitisePathsForVerify(url);
var settings = VerifyHelper.GetSpanVerifierSettings(test, sanitisedUrl, body);
FilterConnectionHeader(settings);
Expand Down
Loading