diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 8ae1a4aee98a..46e15cea198e 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -3472,8 +3472,9 @@ stages: -e IncludeTestsRequiringDocker=false \ -e Filter=$(IntegrationTestFilter) \ -e SampleName=$(IntegrationTestSampleName) \ + -e Area=$(area) \ IntegrationTests.ARM64 - displayName: docker-compose run --no-deps IntegrationTests + displayName: docker-compose run --no-deps IntegrationTests ($(area)) env: DD_LOGGER_DD_API_KEY: $(ddApiKey) baseImage: $(baseImage) # for interpolation in the docker-compose file @@ -3555,8 +3556,9 @@ stages: -e IncludeTestsRequiringDocker=true \ -e Filter=$(IntegrationTestFilter) \ -e SampleName=$(IntegrationTestSampleName) \ + -e Area=$(area) \ IntegrationTests.ARM64 \ - displayName: docker-compose run IntegrationTests + displayName: docker-compose run IntegrationTests ($(area)) env: DD_LOGGER_DD_API_KEY: $(ddApiKey) baseImage: $(baseImage) # for interpolation in the docker-compose file diff --git a/tracer/build/_build/Build.VariableGenerations.cs b/tracer/build/_build/Build.VariableGenerations.cs index c2eba559cd69..dcb93327b6db 100644 --- a/tracer/build/_build/Build.VariableGenerations.cs +++ b/tracer/build/_build/Build.VariableGenerations.cs @@ -416,13 +416,13 @@ void GenerateIntegrationTestsLinuxArm64Matrix() { foreach (var (baseImage, artifactSuffix) in baseImages) { - if (ShouldBeIncluded(AsmArea)) - { - matrix.Add($"{baseImage}_{framework}", new { publishTargetFramework = framework, baseImage = baseImage, artifactSuffix = artifactSuffix }); - } - else + var areas = new[] { TracerArea, AsmArea, CiVisibilityArea }; + foreach (var area in areas) { - matrix.Add($"{baseImage}_{framework}", new { publishTargetFramework = framework, baseImage = baseImage, artifactSuffix = artifactSuffix, area = TracerArea }); + if (ShouldBeIncluded(area)) + { + matrix.Add($"{baseImage}_{framework}_{area}", new { publishTargetFramework = framework, baseImage = baseImage, artifactSuffix = artifactSuffix, area = area }); + } } } }