From 7dc08de2f8f980408547d310519428b7fdf68c00 Mon Sep 17 00:00:00 2001 From: Maximo Bautista Date: Sat, 23 Mar 2024 13:44:43 -0400 Subject: [PATCH 1/9] Updated in different things to check outcome --- .azure-pipelines/ultimate-pipeline.yml | 79 +++++++++++++------------- 1 file changed, 40 insertions(+), 39 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index af9868e06812..7e5487089a47 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -3887,7 +3887,7 @@ stages: parameters: jobs: [Linux64, Windows64, LinuxArm64, AsmLinux64] allowSkipped: true - #### Throughput Linux 64, windows 64, linux arm 64 + #### Throughput Linux 64, Windows 64, Linux Arm 64, Linux 64 for ASM - job: Linux64 timeoutInMinutes: 60 @@ -3988,6 +3988,7 @@ stages: parameters: targetShaId: $(targetShaId) targetBranch: $(targetBranch) + - task: DownloadPipelineArtifact@2 displayName: Download arm64 native binary inputs: @@ -4028,48 +4029,47 @@ stages: - job: AsmLinux64 timeoutInMinutes: 60 pool: Throughput-AppSec - condition: > - or( - eq(variables.isMainBranch, true), - eq(variables.force_appsec_throughput_run, 'true'), - eq(variables.isAppSecChanged, 'True') - ) steps: - - template: steps/clone-repo.yml - parameters: - targetShaId: $(targetShaId) - targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download linux native binary - inputs: - artifact: linux-monitoring-home-linux-x64 - path: $(System.DefaultWorkingDirectory)/tracer/tracer-home-linux + - template: steps/clone-repo.yml + parameters: + targetShaId: $(targetShaId) + targetBranch: $(targetBranch) - - script: | - test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so (native loader) does not exist" && exit 1 - test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so does not exist" && exit 1 - test ! -s "tracer/tracer-home-linux/linux-x64/libddwaf.so" && echo "tracer/tracer-home-linux/linux-x64/libddwaf.so does not exist" && exit 1 - mkdir -p $(CrankDir)/results/logs - cd $(CrankDir) - chmod +x ./run-appsec.sh - ./run-appsec.sh "linux" - displayName: Crank - env: - DD_SERVICE: dd-trace-dotnet - DD_ENV: CI + - task: DownloadPipelineArtifact@2 + displayName: Download linux native binary + inputs: + artifact: linux-monitoring-home-linux-x64 + path: $(System.DefaultWorkingDirectory)/tracer/tracer-home-linux - - script: | - cp $(CrankDir)/*.json $(CrankDir)/results - displayName: Copy the results to results dir - - - publish: "$(CrankDir)/results" - displayName: Publish results - # We don't include the JobAttempt in this case, because we rely on a specific name - # and an error in the throughput tests probably means no usable data, so dont - # bother trying to upload these in case of failure, which means we can retry the - # stages without issue - artifact: crank_linux_x64_asm_1 + - script: | + test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so (native loader) does not exist" && exit 1 + test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so does not exist" && exit 1 + test ! -s "tracer/tracer-home-linux/linux-x64/libddwaf.so" && echo "tracer/tracer-home-linux/linux-x64/libddwaf.so does not exist" && exit 1 + mkdir -p tracer/bin/netcoreapp3.1 + cp tracer/tracer-home-linux/netcoreapp3.1/Datadog.Trace.dll tracer/bin/netcoreapp3.1/Datadog.Trace.dll + mkdir -p $(CrankDir)/results/logs + cd $(CrankDir) + chmod +x ./run-appsec.sh + ./run-appsec.sh "linux" + displayName: Crank + env: + DD_SERVICE: dd-trace-dotnet + DD_ENV: CI + DD_CIVISIBILITY_AGENTLESS_ENABLED: true + DD_API_KEY: $(ddApiKey) + + - script: | + cp $(CrankDir)/*.json $(CrankDir)/results + displayName: Copy the results to results dir + + - publish: "$(CrankDir)/results" + displayName: Publish results + # We don't include the JobAttempt in this case, because we rely on a specific name + # and an error in the throughput tests probably means no usable data, so dont + # bother trying to upload these in case of failure, which means we can retry the + # stages without issue + artifact: crank_linux_x64_asm_1 - stage: throughput_profiler condition: > @@ -5959,6 +5959,7 @@ stages: - task: DownloadPipelineArtifact@2 displayName: Download crank_linux_x64_asm_1 continueOnError: true + condition: succeededOrFailed() inputs: artifact: crank_linux_x64_asm_1 path: $(System.DefaultWorkingDirectory)/tracer/build_data/throughput/current/crank_linux_x64_asm_1 From 1fb519b085cbda648c035163d43be1792762e34b Mon Sep 17 00:00:00 2001 From: Maximo Bautista Date: Sat, 23 Mar 2024 15:06:19 -0400 Subject: [PATCH 2/9] Testing the outcome of running without exiting --- .../Samples.AspNetCoreSimpleController/Program.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tracer/test/test-applications/throughput/Samples.AspNetCoreSimpleController/Program.cs b/tracer/test/test-applications/throughput/Samples.AspNetCoreSimpleController/Program.cs index 00198b563b1e..40861140b99a 100644 --- a/tracer/test/test-applications/throughput/Samples.AspNetCoreSimpleController/Program.cs +++ b/tracer/test/test-applications/throughput/Samples.AspNetCoreSimpleController/Program.cs @@ -38,9 +38,10 @@ public static void Main(string[] args) if (!isAttached && tracerEnabled) { - Console.WriteLine("Error: Profiler is required and is not loaded."); - Environment.Exit(1); - return; + Console.WriteLine("Error: Profiler is required and is not loaded!!!"); + Console.WriteLine(" * Running without profiler."); + /*Environment.Exit(1); + return;*/ } nativeTracerVersion = SampleHelpers.GetNativeTracerVersion(); From bade23e6504be1481f056f190c985dfb443e67cd Mon Sep 17 00:00:00 2001 From: Maximo Bautista Date: Sat, 23 Mar 2024 17:00:16 -0400 Subject: [PATCH 3/9] Realized the crank Agent version is indeed different for each pool --- .azure-pipelines/ultimate-pipeline.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 7e5487089a47..ff33dc35abf3 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -3988,7 +3988,6 @@ stages: parameters: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 displayName: Download arm64 native binary inputs: @@ -4028,14 +4027,19 @@ stages: - job: AsmLinux64 timeoutInMinutes: 60 - pool: Throughput-AppSec + pool: Throughput + condition: > + or( + eq(variables.isMainBranch, true), + eq(variables.force_appsec_throughput_run, 'true'), + eq(variables.isAppSecChanged, 'True') + ) steps: - template: steps/clone-repo.yml parameters: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 displayName: Download linux native binary inputs: @@ -4046,8 +4050,6 @@ stages: test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so (native loader) does not exist" && exit 1 test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so does not exist" && exit 1 test ! -s "tracer/tracer-home-linux/linux-x64/libddwaf.so" && echo "tracer/tracer-home-linux/linux-x64/libddwaf.so does not exist" && exit 1 - mkdir -p tracer/bin/netcoreapp3.1 - cp tracer/tracer-home-linux/netcoreapp3.1/Datadog.Trace.dll tracer/bin/netcoreapp3.1/Datadog.Trace.dll mkdir -p $(CrankDir)/results/logs cd $(CrankDir) chmod +x ./run-appsec.sh @@ -4056,8 +4058,6 @@ stages: env: DD_SERVICE: dd-trace-dotnet DD_ENV: CI - DD_CIVISIBILITY_AGENTLESS_ENABLED: true - DD_API_KEY: $(ddApiKey) - script: | cp $(CrankDir)/*.json $(CrankDir)/results @@ -5959,7 +5959,6 @@ stages: - task: DownloadPipelineArtifact@2 displayName: Download crank_linux_x64_asm_1 continueOnError: true - condition: succeededOrFailed() inputs: artifact: crank_linux_x64_asm_1 path: $(System.DefaultWorkingDirectory)/tracer/build_data/throughput/current/crank_linux_x64_asm_1 From d61aba7e1bd58fced9af1624424c2f24bebca62a Mon Sep 17 00:00:00 2001 From: Maximo Bautista Date: Sat, 23 Mar 2024 17:39:26 -0400 Subject: [PATCH 4/9] Removed condition and switched pool --- .azure-pipelines/ultimate-pipeline.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index ff33dc35abf3..31b4c9793d41 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -3891,7 +3891,7 @@ stages: - job: Linux64 timeoutInMinutes: 60 - pool: Throughput + pool: Throughput-Appsec steps: - template: steps/clone-repo.yml @@ -4028,12 +4028,6 @@ stages: - job: AsmLinux64 timeoutInMinutes: 60 pool: Throughput - condition: > - or( - eq(variables.isMainBranch, true), - eq(variables.force_appsec_throughput_run, 'true'), - eq(variables.isAppSecChanged, 'True') - ) steps: - template: steps/clone-repo.yml From f9b88eecb0ce44853c008db8765179dac867c4aa Mon Sep 17 00:00:00 2001 From: Maximo Bautista Date: Sat, 23 Mar 2024 19:38:06 -0400 Subject: [PATCH 5/9] Running job as usual but changing pool to Throughput --- .azure-pipelines/ultimate-pipeline.yml | 74 ++++++++++--------- .../Program.cs | 7 +- 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 31b4c9793d41..928812bca61e 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -3887,11 +3887,11 @@ stages: parameters: jobs: [Linux64, Windows64, LinuxArm64, AsmLinux64] allowSkipped: true - #### Throughput Linux 64, Windows 64, Linux Arm 64, Linux 64 for ASM + #### Throughput Linux 64, Windows 64, Linux arm 64, AsmLinux64 - job: Linux64 timeoutInMinutes: 60 - pool: Throughput-Appsec + pool: Throughput steps: - template: steps/clone-repo.yml @@ -4028,42 +4028,48 @@ stages: - job: AsmLinux64 timeoutInMinutes: 60 pool: Throughput + condition: > + or( + eq(variables.isMainBranch, true), + eq(variables.force_appsec_throughput_run, 'true'), + eq(variables.isAppSecChanged, 'True') + ) steps: - - template: steps/clone-repo.yml - parameters: - targetShaId: $(targetShaId) - targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download linux native binary - inputs: - artifact: linux-monitoring-home-linux-x64 - path: $(System.DefaultWorkingDirectory)/tracer/tracer-home-linux - - - script: | - test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so (native loader) does not exist" && exit 1 - test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so does not exist" && exit 1 - test ! -s "tracer/tracer-home-linux/linux-x64/libddwaf.so" && echo "tracer/tracer-home-linux/linux-x64/libddwaf.so does not exist" && exit 1 - mkdir -p $(CrankDir)/results/logs - cd $(CrankDir) - chmod +x ./run-appsec.sh - ./run-appsec.sh "linux" - displayName: Crank - env: - DD_SERVICE: dd-trace-dotnet - DD_ENV: CI + - template: steps/clone-repo.yml + parameters: + targetShaId: $(targetShaId) + targetBranch: $(targetBranch) + - task: DownloadPipelineArtifact@2 + displayName: Download linux native binary + inputs: + artifact: linux-monitoring-home-linux-x64 + path: $(System.DefaultWorkingDirectory)/tracer/tracer-home-linux - - script: | - cp $(CrankDir)/*.json $(CrankDir)/results - displayName: Copy the results to results dir + - script: | + test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so (native loader) does not exist" && exit 1 + test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so does not exist" && exit 1 + test ! -s "tracer/tracer-home-linux/linux-x64/libddwaf.so" && echo "tracer/tracer-home-linux/linux-x64/libddwaf.so does not exist" && exit 1 + mkdir -p $(CrankDir)/results/logs + cd $(CrankDir) + chmod +x ./run-appsec.sh + ./run-appsec.sh "linux" + displayName: Crank + env: + DD_SERVICE: dd-trace-dotnet + DD_ENV: CI - - publish: "$(CrankDir)/results" - displayName: Publish results - # We don't include the JobAttempt in this case, because we rely on a specific name - # and an error in the throughput tests probably means no usable data, so dont - # bother trying to upload these in case of failure, which means we can retry the - # stages without issue - artifact: crank_linux_x64_asm_1 + - script: | + cp $(CrankDir)/*.json $(CrankDir)/results + displayName: Copy the results to results dir + + - publish: "$(CrankDir)/results" + displayName: Publish results + # We don't include the JobAttempt in this case, because we rely on a specific name + # and an error in the throughput tests probably means no usable data, so dont + # bother trying to upload these in case of failure, which means we can retry the + # stages without issue + artifact: crank_linux_x64_asm_1 - stage: throughput_profiler condition: > diff --git a/tracer/test/test-applications/throughput/Samples.AspNetCoreSimpleController/Program.cs b/tracer/test/test-applications/throughput/Samples.AspNetCoreSimpleController/Program.cs index 40861140b99a..00198b563b1e 100644 --- a/tracer/test/test-applications/throughput/Samples.AspNetCoreSimpleController/Program.cs +++ b/tracer/test/test-applications/throughput/Samples.AspNetCoreSimpleController/Program.cs @@ -38,10 +38,9 @@ public static void Main(string[] args) if (!isAttached && tracerEnabled) { - Console.WriteLine("Error: Profiler is required and is not loaded!!!"); - Console.WriteLine(" * Running without profiler."); - /*Environment.Exit(1); - return;*/ + Console.WriteLine("Error: Profiler is required and is not loaded."); + Environment.Exit(1); + return; } nativeTracerVersion = SampleHelpers.GetNativeTracerVersion(); From 4aa06617b3e662d96d8544a93fd6bbc25b56aeb7 Mon Sep 17 00:00:00 2001 From: Maximo Bautista Date: Mon, 25 Mar 2024 07:42:03 -0400 Subject: [PATCH 6/9] Trying to have Agent run as root --- .azure-pipelines/ultimate-pipeline.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 928812bca61e..5597d98196b0 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -4028,12 +4028,6 @@ stages: - job: AsmLinux64 timeoutInMinutes: 60 pool: Throughput - condition: > - or( - eq(variables.isMainBranch, true), - eq(variables.force_appsec_throughput_run, 'true'), - eq(variables.isAppSecChanged, 'True') - ) steps: - template: steps/clone-repo.yml @@ -4047,6 +4041,7 @@ stages: path: $(System.DefaultWorkingDirectory)/tracer/tracer-home-linux - script: | + export AGENT_ALLOW_RUNASROOT=1 test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so (native loader) does not exist" && exit 1 test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so does not exist" && exit 1 test ! -s "tracer/tracer-home-linux/linux-x64/libddwaf.so" && echo "tracer/tracer-home-linux/linux-x64/libddwaf.so does not exist" && exit 1 From 759d47e0a6de30218bf0cb75d00b1e53a4ccd8a2 Mon Sep 17 00:00:00 2001 From: Maximo Bautista Date: Mon, 25 Mar 2024 08:31:42 -0400 Subject: [PATCH 7/9] Forgot to change pool back --- .azure-pipelines/ultimate-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 5597d98196b0..8ef2aa8eb2c8 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -4027,7 +4027,7 @@ stages: - job: AsmLinux64 timeoutInMinutes: 60 - pool: Throughput + pool: Throughput-AppSec steps: - template: steps/clone-repo.yml From f10e299159c49488983d2bc9456232757c3b5fb2 Mon Sep 17 00:00:00 2001 From: Maximo Bautista Date: Wed, 27 Mar 2024 14:21:46 -0400 Subject: [PATCH 8/9] Commenting out Throughput job: AsmLinux64 --- .azure-pipelines/ultimate-pipeline.yml | 85 ++++++++++++++------------ 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 8ef2aa8eb2c8..df49100b91c7 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -4025,46 +4025,51 @@ stages: #### Throughput-AppSec Linux 64 - - job: AsmLinux64 - timeoutInMinutes: 60 - pool: Throughput-AppSec - - steps: - - template: steps/clone-repo.yml - parameters: - targetShaId: $(targetShaId) - targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download linux native binary - inputs: - artifact: linux-monitoring-home-linux-x64 - path: $(System.DefaultWorkingDirectory)/tracer/tracer-home-linux - - - script: | - export AGENT_ALLOW_RUNASROOT=1 - test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so (native loader) does not exist" && exit 1 - test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so does not exist" && exit 1 - test ! -s "tracer/tracer-home-linux/linux-x64/libddwaf.so" && echo "tracer/tracer-home-linux/linux-x64/libddwaf.so does not exist" && exit 1 - mkdir -p $(CrankDir)/results/logs - cd $(CrankDir) - chmod +x ./run-appsec.sh - ./run-appsec.sh "linux" - displayName: Crank - env: - DD_SERVICE: dd-trace-dotnet - DD_ENV: CI - - - script: | - cp $(CrankDir)/*.json $(CrankDir)/results - displayName: Copy the results to results dir - - - publish: "$(CrankDir)/results" - displayName: Publish results - # We don't include the JobAttempt in this case, because we rely on a specific name - # and an error in the throughput tests probably means no usable data, so dont - # bother trying to upload these in case of failure, which means we can retry the - # stages without issue - artifact: crank_linux_x64_asm_1 +# - job: AsmLinux64 +# timeoutInMinutes: 60 +# pool: Throughput-AppSec +# condition: > +# or( +# eq(variables.isMainBranch, true), +# eq(variables.force_appsec_throughput_run, 'true'), +# eq(variables.isAppSecChanged, 'True') +# ) +# +# steps: +# - template: steps/clone-repo.yml +# parameters: +# targetShaId: $(targetShaId) +# targetBranch: $(targetBranch) +# - task: DownloadPipelineArtifact@2 +# displayName: Download linux native binary +# inputs: +# artifact: linux-monitoring-home-linux-x64 +# path: $(System.DefaultWorkingDirectory)/tracer/tracer-home-linux +# +# - script: | +# test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so (native loader) does not exist" && exit 1 +# test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so does not exist" && exit 1 +# test ! -s "tracer/tracer-home-linux/linux-x64/libddwaf.so" && echo "tracer/tracer-home-linux/linux-x64/libddwaf.so does not exist" && exit 1 +# mkdir -p $(CrankDir)/results/logs +# cd $(CrankDir) +# chmod +x ./run-appsec.sh +# ./run-appsec.sh "linux" +# displayName: Crank +# env: +# DD_SERVICE: dd-trace-dotnet +# DD_ENV: CI +# +# - script: | +# cp $(CrankDir)/*.json $(CrankDir)/results +# displayName: Copy the results to results dir +# +# - publish: "$(CrankDir)/results" +# displayName: Publish results +# # We don't include the JobAttempt in this case, because we rely on a specific name +# # and an error in the throughput tests probably means no usable data, so dont +# # bother trying to upload these in case of failure, which means we can retry the +# # stages without issue +# artifact: crank_linux_x64_asm_1 - stage: throughput_profiler condition: > From 96fc5b3879a776d1d5f3b76721ff6808ced16d5a Mon Sep 17 00:00:00 2001 From: Maximo Bautista Date: Thu, 28 Mar 2024 08:10:56 -0400 Subject: [PATCH 9/9] Removing Asm throughput related jobs --- .azure-pipelines/ultimate-pipeline.yml | 59 +------------------------- 1 file changed, 2 insertions(+), 57 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index df49100b91c7..d967187c5044 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -3885,9 +3885,9 @@ stages: jobs: - template: steps/update-github-status-jobs.yml parameters: - jobs: [Linux64, Windows64, LinuxArm64, AsmLinux64] + jobs: [Linux64, Windows64, LinuxArm64] allowSkipped: true - #### Throughput Linux 64, Windows 64, Linux arm 64, AsmLinux64 + #### Throughput Linux 64, Windows 64, Linux arm 64 - job: Linux64 timeoutInMinutes: 60 @@ -4022,54 +4022,6 @@ stages: # bother trying to upload these in case of failure, which means we can retry the # stages without issue artifact: crank_linux_arm64_1 - - #### Throughput-AppSec Linux 64 - -# - job: AsmLinux64 -# timeoutInMinutes: 60 -# pool: Throughput-AppSec -# condition: > -# or( -# eq(variables.isMainBranch, true), -# eq(variables.force_appsec_throughput_run, 'true'), -# eq(variables.isAppSecChanged, 'True') -# ) -# -# steps: -# - template: steps/clone-repo.yml -# parameters: -# targetShaId: $(targetShaId) -# targetBranch: $(targetBranch) -# - task: DownloadPipelineArtifact@2 -# displayName: Download linux native binary -# inputs: -# artifact: linux-monitoring-home-linux-x64 -# path: $(System.DefaultWorkingDirectory)/tracer/tracer-home-linux -# -# - script: | -# test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Trace.ClrProfiler.Native.so (native loader) does not exist" && exit 1 -# test ! -s "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so" && echo "tracer/tracer-home-linux/linux-x64/Datadog.Tracer.Native.so does not exist" && exit 1 -# test ! -s "tracer/tracer-home-linux/linux-x64/libddwaf.so" && echo "tracer/tracer-home-linux/linux-x64/libddwaf.so does not exist" && exit 1 -# mkdir -p $(CrankDir)/results/logs -# cd $(CrankDir) -# chmod +x ./run-appsec.sh -# ./run-appsec.sh "linux" -# displayName: Crank -# env: -# DD_SERVICE: dd-trace-dotnet -# DD_ENV: CI -# -# - script: | -# cp $(CrankDir)/*.json $(CrankDir)/results -# displayName: Copy the results to results dir -# -# - publish: "$(CrankDir)/results" -# displayName: Publish results -# # We don't include the JobAttempt in this case, because we rely on a specific name -# # and an error in the throughput tests probably means no usable data, so dont -# # bother trying to upload these in case of failure, which means we can retry the -# # stages without issue -# artifact: crank_linux_x64_asm_1 - stage: throughput_profiler condition: > @@ -5956,13 +5908,6 @@ stages: artifact: crank_linux_x64_1 path: $(System.DefaultWorkingDirectory)/tracer/build_data/throughput/current/crank_linux_x64_1 - - task: DownloadPipelineArtifact@2 - displayName: Download crank_linux_x64_asm_1 - continueOnError: true - inputs: - artifact: crank_linux_x64_asm_1 - path: $(System.DefaultWorkingDirectory)/tracer/build_data/throughput/current/crank_linux_x64_asm_1 - - task: DownloadPipelineArtifact@2 displayName: Download crank_windows_x64_1 continueOnError: true