From d6c35ec23dff5ba30d9e4e798ffc584c35448074 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 24 Dec 2025 13:54:27 +0100 Subject: [PATCH 1/3] Retry failing tests --- .azure-pipelines/ultimate-pipeline.yml | 50 ++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 3 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 4eaa36d57982..7f4f1471495e 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -1702,12 +1702,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 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 @@ -1839,11 +1852,23 @@ stages: SampleName: $(IntegrationTestSampleName) - script: tracer\build.cmd RunWindowsTracerIisIntegrationTests -Framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled) - displayName: RunWindowsIisTracerIntegrationTests + displayName: RunWindowsIisTracerIntegrationTests (Tracer) + condition: ne(variables['area'], 'ASM') env: DD_LOGGER_DD_API_KEY: $(ddApiKey) Filter: $(IntegrationTestFilter) SampleName: $(IntegrationTestSampleName) + Area: $(area) + + - script: tracer\build.cmd RunWindowsTracerIisIntegrationTests -Framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled) + displayName: RunWindowsIisTracerIntegrationTests (ASM) + condition: eq(variables['area'], 'ASM') + retryCountOnTaskFailure: 2 + env: + DD_LOGGER_DD_API_KEY: $(ddApiKey) + Filter: $(IntegrationTestFilter) + SampleName: $(IntegrationTestSampleName) + Area: $(area) - task: PublishTestResults@2 displayName: publish test results @@ -2264,7 +2289,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 From 7213fa746f43925cfaa88aadea62205718e2ccc1 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 24 Dec 2025 14:15:24 +0100 Subject: [PATCH 2/3] Do not include integration_tests_windows_iis --- .azure-pipelines/ultimate-pipeline.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 7f4f1471495e..4f58092cff80 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -1852,23 +1852,11 @@ stages: SampleName: $(IntegrationTestSampleName) - script: tracer\build.cmd RunWindowsTracerIisIntegrationTests -Framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled) - displayName: RunWindowsIisTracerIntegrationTests (Tracer) - condition: ne(variables['area'], 'ASM') + displayName: RunWindowsIisTracerIntegrationTests env: DD_LOGGER_DD_API_KEY: $(ddApiKey) Filter: $(IntegrationTestFilter) SampleName: $(IntegrationTestSampleName) - Area: $(area) - - - script: tracer\build.cmd RunWindowsTracerIisIntegrationTests -Framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled) - displayName: RunWindowsIisTracerIntegrationTests (ASM) - condition: eq(variables['area'], 'ASM') - retryCountOnTaskFailure: 2 - env: - DD_LOGGER_DD_API_KEY: $(ddApiKey) - Filter: $(IntegrationTestFilter) - SampleName: $(IntegrationTestSampleName) - Area: $(area) - task: PublishTestResults@2 displayName: publish test results From 137e52ad3c8abda54a154ba67eddfbed1ae9f41d Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 24 Dec 2025 15:29:43 +0100 Subject: [PATCH 3/3] Dummy ASM change to trigger tests --- .../Datadog.Trace.Security.IntegrationTests/AspNetWebApi.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetWebApi.cs b/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetWebApi.cs index 448f07689d55..7aaca72b8f8a 100644 --- a/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetWebApi.cs +++ b/tracer/test/Datadog.Trace.Security.IntegrationTests/AspNetWebApi.cs @@ -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);