From 3e1818c72508d6f8005454076bed0741a3d90b91 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 28 May 2025 10:52:19 +0200 Subject: [PATCH 01/14] Replace DownloadPipelineArtifact by a pipeline step --- .azure-pipelines/steps/download-artifact.yml | 21 + .azure-pipelines/steps/download-samples.yml | 12 +- .../restore-working-directory-for-tests.yml | 12 +- .../steps/restore-working-directory.yml | 8 +- .azure-pipelines/ultimate-pipeline.yml | 756 +++++++++--------- 5 files changed, 417 insertions(+), 392 deletions(-) create mode 100644 .azure-pipelines/steps/download-artifact.yml diff --git a/.azure-pipelines/steps/download-artifact.yml b/.azure-pipelines/steps/download-artifact.yml new file mode 100644 index 000000000000..92cc6fa686a5 --- /dev/null +++ b/.azure-pipelines/steps/download-artifact.yml @@ -0,0 +1,21 @@ +# .azure-pipelines/steps/download-artifact.yml +parameters: + artifact: '' + path: '' + patterns: '' + displayName: '' + condition: '' + # Defaults + timeoutInMinutes: 3 + retryCountOnTaskFailure: 3 + +steps: +- task: DownloadPipelineArtifact@2 + displayName: ${{ parameters.displayName }} + condition: ${{ parameters.condition }} + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }} + inputs: + artifact: ${{ parameters.artifact }} + path: ${{ parameters.path }} + patterns: ${{ parameters.patterns }} \ No newline at end of file diff --git a/.azure-pipelines/steps/download-samples.yml b/.azure-pipelines/steps/download-samples.yml index 4b1216ae5e48..ff1f177985a9 100644 --- a/.azure-pipelines/steps/download-samples.yml +++ b/.azure-pipelines/steps/download-samples.yml @@ -4,17 +4,17 @@ parameters: default: '' steps: -- task: DownloadPipelineArtifact@2 - displayName: Download standalone samples +- template: steps/download-artifact.yml inputs: artifact: samples-standalone path: $(outputDir)/bin - retryCountOnTaskFailure: 5 + displayName: Download standalone samples + retryCountOnTaskFailure: 5 - ${{ if ne(parameters.framework, '') }}: - - task: DownloadPipelineArtifact@2 - displayName: Download multi-version samples + - template: steps/download-artifact.yml inputs: artifact: samples-multi-version-${{ parameters.framework }} path: $(outputDir)/publish - retryCountOnTaskFailure: 5 \ No newline at end of file + displayName: Download multi-version samples + retryCountOnTaskFailure: 5 \ No newline at end of file diff --git a/.azure-pipelines/steps/restore-working-directory-for-tests.yml b/.azure-pipelines/steps/restore-working-directory-for-tests.yml index b7ca2cef1c2a..99e19fd69615 100644 --- a/.azure-pipelines/steps/restore-working-directory-for-tests.yml +++ b/.azure-pipelines/steps/restore-working-directory-for-tests.yml @@ -16,14 +16,14 @@ steps: echo "setting universalArtifactSuffix to ${output}" echo "##vso[task.setvariable variable=universalArtifactSuffix]${output}" -- task: DownloadPipelineArtifact@2 - displayName: Download universal home binaries - inputs: +- template: ./steps/download-artifact.yml + parameters: + displayName: Download universal home binaries artifact: linux-universal-home-$(universalArtifactSuffix) path: $(monitoringHome)/${{ parameters.artifactSuffix }} -- task: DownloadPipelineArtifact@2 - displayName: Download profiler binaries - inputs: +- template: ./steps/download-artifact.yml + parameters: + displayName: Download profiler binaries artifact: linux-profiler-home-${{ parameters.artifactSuffix }} path: $(monitoringHome) \ No newline at end of file diff --git a/.azure-pipelines/steps/restore-working-directory.yml b/.azure-pipelines/steps/restore-working-directory.yml index 02fad03ede46..5cccd077d552 100644 --- a/.azure-pipelines/steps/restore-working-directory.yml +++ b/.azure-pipelines/steps/restore-working-directory.yml @@ -4,10 +4,10 @@ parameters: default: 'build-windows-working-directory' steps: -- task: DownloadPipelineArtifact@2 - displayName: Download working dir - inputs: +- template: steps/download-artifact.yml + parameters: artifact: ${{ parameters.artifact }} patterns: "**/@(bin|obj|packages)/**" path: $(System.DefaultWorkingDirectory) - retryCountOnTaskFailure: 5 \ No newline at end of file + displayName: 'Download working dir' + retryCountOnTaskFailure: 5 \ No newline at end of file diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 950771a97513..63eb949b5809 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -585,44 +585,44 @@ stages: # Download _both_ musl and glibc if we're building the universal package # but only the musl package if we're building alpine package - - task: DownloadPipelineArtifact@2 - displayName: Download tracer linux native binary (linux-x64) - condition: eq(variables['artifactSuffix'], 'linux-x64') - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-home-linux-x64 path: $(monitoringHome) + displayName: Download tracer linux native binary (linux-x64) + condition: eq(variables['artifactSuffix'], 'linux-x64') - - task: DownloadPipelineArtifact@2 - displayName: Download profiler linux native binary (linux-x64) - condition: eq(variables['artifactSuffix'], 'linux-x64') - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-profiler-home-linux-x64 path: $(monitoringHome) + displayName: Download profiler linux native binary (linux-x64) + condition: eq(variables['artifactSuffix'], 'linux-x64') - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet (linux-x64) - condition: eq(variables['artifactSuffix'], 'linux-x64') - inputs: + - template: steps/download-artifact.yml + parameters: artifact: dd-dotnet-linux-x64 path: $(monitoringHome)/linux-x64 + displayName: Download dd-dotnet (linux-x64) + condition: eq(variables['artifactSuffix'], 'linux-x64') - - task: DownloadPipelineArtifact@2 - displayName: Download tracer linux native binary (linux-musl-x64) - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-home-linux-musl-x64 path: $(monitoringHome) + displayName: Download tracer linux native binary (linux-musl-x64) - - task: DownloadPipelineArtifact@2 - displayName: Download profiler linux native binary (linux-musl-x64) - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-profiler-home-linux-musl-x64 path: $(monitoringHome) + displayName: Download profiler linux native binary (linux-musl-x64) - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet (linux-musl-x64) - inputs: + - template: steps/download-artifact.yml + parameters: artifact: dd-dotnet-linux-musl-x64 path: $(monitoringHome)/linux-musl-x64 + displayName: Download dd-dotnet (linux-musl-x64) - script: | chmod +x $(monitoringHome)/linux-musl-x64/dd-dotnet @@ -630,11 +630,11 @@ stages: chmod +x $(monitoringHome)/linux-x64/dd-dotnet | : displayName: chmod dd-dotnet - - task: DownloadPipelineArtifact@2 - displayName: Download universal native binaries - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-universal-home-linux-x64 path: $(monitoringHome)/$(artifactSuffix) + displayName: Download universal native binaries - template: steps/run-in-docker.yml parameters: @@ -867,44 +867,44 @@ stages: # Download _both_ musl and glibc if we're building the universal package # but only the musl package if we're building alpine package - - task: DownloadPipelineArtifact@2 - displayName: Download tracer arm64 native binary - condition: eq(variables['artifactSuffix'], 'linux-arm64') - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-home-linux-arm64 path: $(monitoringHome) + displayName: Download tracer arm64 native binary + condition: eq(variables['artifactSuffix'], 'linux-arm64') - - task: DownloadPipelineArtifact@2 - displayName: Download profiler arm64 native binary - condition: eq(variables['artifactSuffix'], 'linux-arm64') - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-profiler-home-linux-arm64 path: $(monitoringHome) + displayName: Download profiler arm64 native binary + condition: eq(variables['artifactSuffix'], 'linux-arm64') - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet linux-arm64 - condition: eq(variables['artifactSuffix'], 'linux-arm64') - inputs: + - template: steps/download-artifact.yml + parameters: artifact: dd-dotnet-linux-arm64 path: $(monitoringHome)/linux-arm64 + displayName: Download dd-dotnet linux-arm64 + condition: eq(variables['artifactSuffix'], 'linux-arm64') - - task: DownloadPipelineArtifact@2 - displayName: Download tracer linux-musl-arm64 native binary - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-home-linux-musl-arm64 path: $(monitoringHome) + displayName: Download tracer linux-musl-arm64 native binary - - task: DownloadPipelineArtifact@2 - displayName: Download profiler linux-musl-arm64 native binary - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-profiler-home-linux-musl-arm64 path: $(monitoringHome) + displayName: Download profiler linux-musl-arm64 native binary - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet linux-musl-arm64 - inputs: + - template: steps/download-artifact.yml + parameters: artifact: dd-dotnet-linux-musl-arm64 path: $(monitoringHome)/linux-musl-arm64 + displayName: Download dd-dotnet linux-musl-arm64 - script: | chmod +x $(monitoringHome)/linux-musl-arm64/dd-dotnet @@ -912,11 +912,11 @@ stages: chmod +x $(monitoringHome)/linux-arm64/dd-dotnet | : displayName: chmod dd-dotnet - - task: DownloadPipelineArtifact@2 - displayName: Download universal native binaries - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-universal-home-linux-arm64 path: $(monitoringHome)/$(artifactSuffix) + displayName: Download universal native binaries - template: steps/run-in-docker.yml parameters: @@ -997,17 +997,17 @@ stages: steps: - checkout: none - - task: DownloadPipelineArtifact@2 - displayName: Download native tracer - inputs: + - template: steps/download-artifact.yml + parameters: artifact: build-macos-native_tracer path: $(monitoringHome) + displayName: Download native tracer - - task: DownloadPipelineArtifact@2 - displayName: Download native loader and managed - inputs: + - template: steps/download-artifact.yml + parameters: artifact: build-macos-native_loader path: $(monitoringHome) + displayName: Download native loader and managed - publish: $(monitoringHome) displayName: Uploading combined macos profiler artifact @@ -1034,15 +1034,15 @@ stages: - template: steps/install-latest-dotnet-sdk.yml - template: steps/restore-working-directory.yml - - task: DownloadPipelineArtifact@2 - displayName: Download windows profiler home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download windows profiler home artifact: windows-profiler-home path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet win-x64 - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download dd-dotnet win-x64 artifact: dd-dotnet-win-x64 path: $(monitoringHome)/win-x64 @@ -1376,11 +1376,11 @@ stages: artifact: build-macos-working-directory # The native tracer is built and uploaded separately for perf reasons, so needs to be explicitly downloaded here - - task: DownloadPipelineArtifact@2 - displayName: Download native tracer - inputs: + - template: steps/download-artifact.yml + parameters: artifact: build-macos-native_tracer path: $(monitoringHome) + displayName: Download native tracer - script: ./tracer/build.sh BuildAndRunManagedUnitTests --framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled) displayName: Build and Test @@ -2044,12 +2044,12 @@ stages: includeX86: true - template: steps/restore-working-directory.yml - - task: DownloadPipelineArtifact@2 - displayName: Download MSI - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download MSI artifact: windows-msi-$(targetPlatform) - patterns: '**/*-$(targetPlatform).msi' path: $(System.DefaultWorkingDirectory)$(relativeMsiOutputDirectory) + patterns: '**/*-$(targetPlatform).msi' - script: tracer\build.cmd BuildAspNetIntegrationTests -Framework $(framework) displayName: BuildWindowsIntegrationTests @@ -2644,12 +2644,12 @@ stages: includeX86: true # windows-tracer-home.zip file contains profiler, tracer... - - task: DownloadPipelineArtifact@2 - displayName: Download monitoring home zip - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download monitoring home zip artifact: windows-tracer-home.zip - patterns: "windows-tracer-home.zip" path: $(Agent.TempDirectory) + patterns: "windows-tracer-home.zip" - task: ExtractFiles@1 inputs: @@ -2720,17 +2720,18 @@ stages: parameters: artifact: build-$(artifactSuffix)-working-directory - - task: DownloadPipelineArtifact@2 - displayName: Download linux monitoring home + - template: steps/download-artifact.yml + parameters: inputs: artifact: linux-monitoring-home-$(artifactSuffix) path: $(monitoringHome) + displayName: Download linux monitoring home - - task: DownloadPipelineArtifact@2 - displayName: Download linux debug symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-profiler-symbols-$(artifactSuffix) path: $(monitoringHome) + displayName: Download linux debug symbols # when we build samples separately, we could run this step and the docker-compose one below in // # (currently the docker-compose step relies on serverless samples) @@ -2938,6 +2939,7 @@ stages: TestAllPackageVersions: true IncludeMinorPackageVersions: $[eq(variables.perform_comprehensive_testing, 'true')] + jobs: - template: steps/update-github-status-jobs.yml parameters: @@ -3375,154 +3377,154 @@ stages: targetBranch: $(targetBranch) - template: steps/install-latest-dotnet-sdk.yml # download _everything_ not just the bin/obj/package files - - task: DownloadPipelineArtifact@2 - displayName: Download working dir - inputs: + - template: steps/download-artifact.yml + parameters: artifact: build-windows-working-directory path: $(System.DefaultWorkingDirectory) - retryCountOnTaskFailure: 5 + retryCountOnTaskFailure: 5 + displayName: Download working dir # Download everything to monitoring home # BuildBundleNuget moves everything to the required folders - - task: DownloadPipelineArtifact@2 - displayName: Download linux tracer home - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-home-linux-x64 patterns: | **/*.so **/loader.conf path: $(monitoringHome) + displayName: Download linux tracer home - - task: DownloadPipelineArtifact@2 - displayName: Download alpine tracer home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download alpine tracer home artifact: linux-tracer-home-linux-musl-x64 - patterns: | + patterns: | **/*.so **/loader.conf path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download arm64 tracer home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download arm64 tracer home artifact: linux-tracer-home-linux-arm64 - patterns: | + patterns: | **/*.so **/loader.conf path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download alpine arm64 tracer home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download alpine arm64 tracer home artifact: linux-tracer-home-linux-musl-arm64 - patterns: | + patterns: | **/*.so **/loader.conf path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download osx tracer home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download osx tracer home artifact: macos-tracer-home - patterns: | + patterns: | **/*.dylib **/loader.conf path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download windows profiler home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download windows profiler home artifact: windows-profiler-home patterns: "**/*.dll" path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download linux profiler home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download linux profiler home artifact: linux-profiler-home-linux-x64 - patterns: | + patterns: | **/*.so **/loader.conf path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download alpine profiler home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download alpine profiler home artifact: linux-profiler-home-linux-musl-x64 - patterns: | + patterns: | **/*.so **/loader.conf path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download arm64 profiler home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download arm64 profiler home artifact: linux-profiler-home-linux-arm64 - patterns: | + patterns: | **/*.so **/loader.conf path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download alpine arm64 profiler home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download alpine arm64 profiler home artifact: linux-profiler-home-linux-musl-arm64 - patterns: | + patterns: | **/*.so **/loader.conf path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet win-x64 - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download dd-dotnet win-x64 artifact: dd-dotnet-win-x64 path: $(monitoringHome)/win-x64 - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet linux-x64 - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download dd-dotnet linux-x64 artifact: dd-dotnet-linux-x64 path: $(monitoringHome)/linux-x64 - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet linux-musl-x64 - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download dd-dotnet linux-musl-x64 artifact: dd-dotnet-linux-musl-x64 path: $(monitoringHome)/linux-musl-x64 - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet linux-arm64 - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download dd-dotnet linux-arm64 artifact: dd-dotnet-linux-arm64 path: $(monitoringHome)/linux-arm64 - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet linux-musl-arm64 - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download dd-dotnet linux-musl-arm64 artifact: dd-dotnet-linux-musl-arm64 path: $(monitoringHome)/linux-musl-arm64 - - task: DownloadPipelineArtifact@2 - displayName: Download linux universal artifacts - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download linux universal artifacts artifact: linux-universal-home-linux-x64 path: $(monitoringHome)/linux-x64 - - task: DownloadPipelineArtifact@2 - displayName: Download linux universal artifacts - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download linux universal artifacts artifact: linux-universal-home-linux-x64 path: $(monitoringHome)/linux-musl-x64 - - task: DownloadPipelineArtifact@2 - displayName: Download linux universal artifacts - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download linux universal artifacts artifact: linux-universal-home-linux-arm64 path: $(monitoringHome)/linux-arm64 - - task: DownloadPipelineArtifact@2 - displayName: Download linux universal artifacts - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download linux universal artifacts artifact: linux-universal-home-linux-arm64 path: $(monitoringHome)/linux-musl-arm64 @@ -3609,27 +3611,27 @@ stages: includeX86: true - template: steps/restore-working-directory.yml - - task: DownloadPipelineArtifact@2 - displayName: Download windows profiler home - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download windows profiler home artifact: windows-profiler-home path: $(monitoringHome) - - task: DownloadPipelineArtifact@2 - displayName: Download tool runner - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download tool runner artifact: runner-dotnet-tool path: $(runnerTool) - - task: DownloadPipelineArtifact@2 - displayName: Download standalone runner - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download standalone runner artifact: runner-standalone-win-$(targetPlatform) path: $(Agent.TempDirectory)/runner - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet win-x64 - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download dd-dotnet win-x64 artifact: dd-dotnet-win-x64 path: $(monitoringHome)/win-x64 @@ -3719,35 +3721,35 @@ stages: parameters: artifact: build-$(artifactSuffix)-working-directory - - task: DownloadPipelineArtifact@2 - displayName: Download profiler linux native binary - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-profiler-home-$(artifactSuffix) path: $(monitoringHome) + displayName: Download profiler linux native binary - - task: DownloadPipelineArtifact@2 - displayName: Download tool runner - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-dotnet-tool path: $(runnerTool) + displayName: Download tool runner - - task: DownloadPipelineArtifact@2 - displayName: Download standalone runner - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-standalone-$(artifactSuffix) path: $(Agent.TempDirectory)/runner + displayName: Download standalone runner - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet $(artifactSuffix) - inputs: + - template: steps/download-artifact.yml + parameters: artifact: dd-dotnet-$(artifactSuffix) path: $(monitoringHome)/$(artifactSuffix) + displayName: Download dd-dotnet $(artifactSuffix) - - task: DownloadPipelineArtifact@2 - displayName: Download universal native binaries - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-universal-home-linux-$(targetArch) path: $(monitoringHome)/$(artifactSuffix) + displayName: Download universal native binaries - task: ExtractFiles@1 inputs: @@ -3806,26 +3808,26 @@ stages: steps: - checkout: none # Linux packages - - task: DownloadPipelineArtifact@2 - displayName: Download linux Alpine tar packages - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-packages-linux-musl-x64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) + displayName: Download linux Alpine tar packages - - task: DownloadPipelineArtifact@2 - displayName: Download linux x64 packages - inputs: - artifact: linux-packages-linux-x64 - patterns: "*.tar.gz" - path: $(Build.ArtifactStagingDirectory) + - template: steps/download-artifact.yml + parameters: + artifact: linux-packages-linux-x64 + patterns: "*.tar.gz" + path: $(Build.ArtifactStagingDirectory) + displayName: Download linux x64 packages - - task: DownloadPipelineArtifact@2 - displayName: Download linux Arm64 packages - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-packages-linux-arm64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) + displayName: Download linux Arm64 packages - bash: | TAR_NAME=$(basename $(Build.ArtifactStagingDirectory)/datadog-dotnet-apm-*.arm64.tar.gz) @@ -3849,29 +3851,29 @@ stages: steps: - checkout: none # Download the files to the expected locations - - task: DownloadPipelineArtifact@2 - displayName: Download serverless tracer home x64 - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-home-linux-x64-r2r path: $(Build.ArtifactStagingDirectory)/x64 + displayName: Download serverless tracer home x64 - - task: DownloadPipelineArtifact@2 - displayName: Download serverless universal home x64 - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-universal-home-linux-x64 path: $(Build.ArtifactStagingDirectory)/x64 + displayName: Download serverless universal home x64 - - task: DownloadPipelineArtifact@2 - displayName: Download serverless tracer home arm64 - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-home-linux-arm64-r2r path: $(Build.ArtifactStagingDirectory)/arm64 + displayName: Download serverless tracer home arm64 - - task: DownloadPipelineArtifact@2 - displayName: Download serverless universal home arm64 - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-universal-home-linux-arm64 path: $(Build.ArtifactStagingDirectory)/arm64 + displayName: Download serverless universal home arm64 # publish all tar files as single artifact - publish: "$(Build.ArtifactStagingDirectory)" @@ -3894,11 +3896,11 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download NuGet packages - inputs: + - template: steps/download-artifact.yml + parameters: artifact: nuget-packages path: $(Build.ArtifactStagingDirectory) + displayName: Download NuGet packages # set the version from the package name - bash: | @@ -3909,114 +3911,114 @@ stages: displayName: Extract version number # Linux packages - - task: DownloadPipelineArtifact@2 - displayName: Download linux Alpine packages - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-packages-linux-musl-x64 path: $(Build.ArtifactStagingDirectory) + displayName: Download linux Alpine packages - - task: DownloadPipelineArtifact@2 - displayName: Download linux x64 packages - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-packages-linux-x64 path: $(Build.ArtifactStagingDirectory) + displayName: Download linux x64 packages - - task: DownloadPipelineArtifact@2 - displayName: Download linux Arm64 packages - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-packages-linux-arm64 path: $(Build.ArtifactStagingDirectory) + displayName: Download linux Arm64 packages # Linux symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux profiler Alpine symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-profiler-symbols-linux-musl-x64 path: $(Build.ArtifactStagingDirectory)/symbols + displayName: Download linux profiler Alpine symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux profiler x64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-profiler-symbols-linux-x64 path: $(Build.ArtifactStagingDirectory)/symbols + displayName: Download linux profiler Alpine symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux profiler Arm64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-profiler-symbols-linux-arm64 path: $(Build.ArtifactStagingDirectory)/symbols + displayName: Download linux profiler Arm64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux profiler Alpine Arm64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-profiler-symbols-linux-musl-arm64 path: $(Build.ArtifactStagingDirectory)/symbols + displayName: Download linux profiler Alpine Arm64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux tracer Alpine symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-symbols-linux-musl-x64 path: $(Build.ArtifactStagingDirectory)/symbols + displayName: Download linux tracer Alpine symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux tracer x64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-symbols-linux-x64 path: $(Build.ArtifactStagingDirectory)/symbols + displayName: Download linux tracer x64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux tracer Arm64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-symbols-linux-arm64 path: $(Build.ArtifactStagingDirectory)/symbols + displayName: Download linux tracer Arm64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux tracer Alpine Arm64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-tracer-symbols-linux-musl-arm64 path: $(Build.ArtifactStagingDirectory)/symbols + displayName: Download linux tracer Alpine Arm64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux universal libraries linux x64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-universal-symbols-linux-x64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-x64 + displayName: Download linux universal libraries linux x64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux universal libraries linux musl x64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-universal-symbols-linux-x64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-musl-x64 + displayName: Download linux universal libraries linux musl x64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux universal libraries linux arm64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-universal-symbols-linux-arm64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-arm64 + displayName: Download linux universal libraries linux arm64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download linux universal libraries linux musl arm64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: linux-universal-symbols-linux-arm64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-musl-arm64 + displayName: Download linux universal libraries linux musl arm64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet linux-x64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: dd-dotnet-symbols-linux-x64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-x64 + displayName: Download dd-dotnet linux-x64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet linux-musl-x64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: dd-dotnet-symbols-linux-musl-x64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-musl-x64 + displayName: Download dd-dotnet linux-musl-x64 symbols - - task: DownloadPipelineArtifact@2 - displayName: Download dd-dotnet linux-arm64 symbols - inputs: + - template: steps/download-artifact.yml + parameters: artifact: dd-dotnet-symbols-linux-arm64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-arm64 + displayName: Download dd-dotnet linux-arm64 symbols - bash: | tar -zcf $(Build.ArtifactStagingDirectory)/linux-native-symbols.tar.gz ./symbols @@ -4027,11 +4029,11 @@ stages: # NuGet - - task: DownloadPipelineArtifact@2 - displayName: Download bundle nuget package - inputs: + - template: steps/download-artifact.yml + parameters: artifact: bundle-nuget-package path: $(Build.ArtifactStagingDirectory) + displayName: Download bundle nuget package # Don't include the Datadog.Trace.BenchmarkDotNet package in the release artifacts # as it currently doesn't work with v3. @@ -4042,47 +4044,47 @@ stages: # path: $(Build.ArtifactStagingDirectory) # runner tool - - task: DownloadPipelineArtifact@2 - displayName: Download runner dotnet tool - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-dotnet-tool patterns: "*.nupkg" path: $(Build.ArtifactStagingDirectory) + displayName: Download runner dotnet tool - - task: DownloadPipelineArtifact@2 - displayName: Download standalone dotnet tool win-x64 - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-standalone-win-x64 patterns: "*.zip" path: $(Build.ArtifactStagingDirectory) + displayName: Download standalone dotnet tool win-x64 - - task: DownloadPipelineArtifact@2 - displayName: Download standalone dotnet tool linux-x64 - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-standalone-linux-x64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) + displayName: Download standalone dotnet tool linux-x64 - - task: DownloadPipelineArtifact@2 - displayName: Download standalone dotnet tool linux-musl-x64 - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-standalone-linux-musl-x64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) + displayName: Download standalone dotnet tool linux-musl-x64 - - task: DownloadPipelineArtifact@2 - displayName: Download standalone dotnet tool linux-arm64 - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-standalone-linux-arm64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) + displayName: Download standalone dotnet tool linux-arm64 - - task: DownloadPipelineArtifact@2 - displayName: Download standalone dotnet tool linux-musl-arm64 - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-standalone-linux-musl-arm64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) + displayName: Download standalone dotnet tool linux-musl-arm64 # release artifacts - publish: "$(Build.ArtifactStagingDirectory)" @@ -4093,25 +4095,25 @@ stages: # not signed, and we use the windows-tracer-home.zip file from # GitLab so that it matches the native symbols file, # but we include them all in the push to Azure - - task: DownloadPipelineArtifact@2 - displayName: Download Windows tracer home - inputs: + - template: steps/download-artifact.yml + parameters: artifact: windows-tracer-home.zip path: $(Build.ArtifactStagingDirectory) + displayName: Download Windows tracer home - - task: DownloadPipelineArtifact@2 - displayName: Download x64 MSI - inputs: + - template: steps/download-artifact.yml + parameters: artifact: windows-msi-x64 path: $(Build.ArtifactStagingDirectory) + displayName: Download x64 MSI # Download the artifacts required by the serverless layer and create the zip file # This exapands the directory - but we want a zip file, so re-zip it! - - task: DownloadPipelineArtifact@2 - displayName: Download serverless artifacts - inputs: + - template: steps/download-artifact.yml + parameters: artifact: serverless-artifacts path: $(Agent.TempDirectory)/serverless-artifacts + displayName: Download serverless artifacts - bash: | cd $(Agent.TempDirectory)/serverless-artifacts @@ -4222,10 +4224,11 @@ stages: targetBranch: $(targetBranch) - template: steps/install-latest-dotnet-sdk.yml - - task: DownloadPipelineArtifact@2 - inputs: - patterns: '**/coverage.cobertura.xml' - path: $(Build.SourcesDirectory)/cover + - template: steps/download-artifact.yml + parameters: + displayName: Download coverage report + patterns: '**/coverage.cobertura.xml' + path: $(Build.SourcesDirectory)/cover - task: reportgenerator@4 inputs: @@ -4279,12 +4282,12 @@ stages: - template: steps/install-latest-dotnet-sdk.yml - template: steps/restore-working-directory.yml - - task: DownloadPipelineArtifact@2 - displayName: Download windows native binary - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download windows native binary artifact: windows-tracer-home path: $(monitoringHome) - retryCountOnTaskFailure: 5 + retryCountOnTaskFailure: 5 - task: DotNetCoreCLI@2 inputs: @@ -4332,17 +4335,17 @@ stages: - template: steps/install-latest-dotnet-sdk.yml - - task: DownloadPipelineArtifact@2 - displayName: Download HttpMessageHandler + - template: steps/download-artifact.yml inputs: artifact: execution_time_benchmarks_windows_x64_HttpMessageHandler_1 #only download the first lot, ignores retries path: $(System.DefaultWorkingDirectory)/artifacts/build_data/execution_benchmarks/current/execution_time_benchmarks_windows_x64_HttpMessageHandler_1 + displayName: Download HttpMessageHandler - - task: DownloadPipelineArtifact@2 - displayName: Download FakeDbCommand + - template: steps/download-artifact.yml inputs: artifact: execution_time_benchmarks_windows_x64_FakeDbCommand_1 #only download the first lot, ignores retries path: $(System.DefaultWorkingDirectory)/artifacts/build_data/execution_benchmarks/current/execution_time_benchmarks_windows_x64_FakeDbCommand_1 + displayName: Download FakeDbCommand - script: tracer\build.cmd CompareExecutionTimeBenchmarkResults displayName: Compare execution-time results @@ -4411,11 +4414,11 @@ stages: parameters: includeX86: true - - task: DownloadPipelineArtifact@2 - displayName: Download profiler windows native binary + - template: steps/download-artifact.yml inputs: artifact: windows-profiler-home path: $(monitoringHome) + displayName: Download profiler windows native binary retryCountOnTaskFailure: 5 - task: DotNetCoreCLI@2 @@ -4502,11 +4505,11 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download profiler linux native binary + - template: steps/download-artifact.yml inputs: artifact: linux-profiler-home-linux-x64 path: $(monitoringHome) + displayName: Download profiler linux native binary retryCountOnTaskFailure: 5 - task: DotNetCoreCLI@2 @@ -4657,9 +4660,9 @@ stages: name: create_matrix workingDirectory: system-tests - - task: DownloadPipelineArtifact@2 - displayName: Download linux-packages - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download linux-packages artifact: linux-packages-linux-x64 patterns: '**/*tar.gz' path: $(Build.ArtifactStagingDirectory) @@ -4720,9 +4723,9 @@ stages: - script: git clone --depth 1 https://github.com/DataDog/system-tests.git displayName: Get system tests repo - - task: DownloadPipelineArtifact@2 - displayName: Download Docker images - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download Docker images artifact: system-test-docker-images path: $(Build.SourcesDirectory) @@ -4785,11 +4788,11 @@ stages: parameters: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download artifacts to smoke test directory - inputs: + - template: steps/download-artifact.yml + parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts + displayName: Download artifacts to smoke test directory - script: | mkdir -p artifacts/build_data/snapshots @@ -4869,11 +4872,11 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download artifacts to smoke test directory - inputs: + - template: steps/download-artifact.yml + parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts + displayName: Download artifacts to smoke test directory # Run the "normal" installer smoke tests - script: | @@ -4943,17 +4946,17 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download bundle nuget - inputs: + - template: steps/download-artifact.yml + parameters: artifact: bundle-nuget-package path: $(smokeTestAppDir)/artifacts + displayName: Download bundle nuget - - task: DownloadPipelineArtifact@2 - displayName: Download Datadog.Trace package - inputs: + - template: steps/download-artifact.yml + parameters: artifact: nuget-packages path: $(smokeTestAppDir)/artifacts + displayName: Download Datadog.Trace package - script: | mkdir -p artifacts/build_data/snapshots @@ -5034,15 +5037,15 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download installer artifacts to smoke test directory - inputs: + - template: steps/download-artifact.yml + parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts + displayName: Download installer artifacts to smoke test directory - - task: DownloadPipelineArtifact@2 - displayName: Download $(packageName) package - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download $(packageName) package artifact: nuget-packages itemPattern: "$(packageName).$(ToolVersion)$(packageVersionSuffix).nupkg" path: $(smokeTestAppDir)/artifacts @@ -5109,11 +5112,11 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download tool runner-dotnet-tool - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-dotnet-tool path: $(smokeTestAppDir)/artifacts + displayName: Download tool runner-dotnet-tool - script: | mkdir -p artifacts/build_data/snapshots @@ -5174,12 +5177,12 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download tool runner-standalone-$(platformSuffix) - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-standalone-$(platformSuffix) patterns: "*.tar.gz" path: $(Agent.TempDirectory) + displayName: Download tool runner-standalone-$(platformSuffix) - script: | mkdir -p artifacts/build_data/snapshots @@ -5247,18 +5250,18 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download artifacts to smoke test directory - inputs: + - template: steps/download-artifact.yml + parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts + displayName: Download artifacts to smoke test directory - - task: DownloadPipelineArtifact@2 - displayName: Download tool runner-standalone-$(platformSuffix) - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-standalone-$(platformSuffix) patterns: "*.tar.gz" path: $(Agent.TempDirectory) + displayName: Download tool runner-standalone-$(platformSuffix) - script: | mkdir -p artifacts/build_data/snapshots @@ -5321,11 +5324,11 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download artifacts to smoke test directory - inputs: + - template: steps/download-artifact.yml + parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts + displayName: Download artifacts to smoke test directory - script: | mkdir -p artifacts/build_data/snapshots @@ -5405,11 +5408,11 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download artifacts to smoke test directory - inputs: + - template: steps/download-artifact.yml + parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts + displayName: Download artifacts to smoke test directory # Run the "normal" installer smoke tests - script: | @@ -5479,17 +5482,18 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 + - template: steps/download-artifact.yml displayName: Download bundle nuget - inputs: + parameters: artifact: bundle-nuget-package path: $(smokeTestAppDir)/artifacts + displayName: Download bundle nuget - - task: DownloadPipelineArtifact@2 - displayName: Download Datadog.Trace package - inputs: + - template: steps/download-artifact.yml + parameters: artifact: nuget-packages path: $(smokeTestAppDir)/artifacts + displayName: Download Datadog.Trace package - script: | mkdir -p artifacts/build_data/snapshots @@ -5566,12 +5570,12 @@ stages: name: azure-managed-linux-arm64-2 steps: - - task: DownloadPipelineArtifact@2 - displayName: Download dotnet tool - inputs: + - template: steps/download-artifact.yml + parameters: artifact: runner-standalone-$(platformSuffix) patterns: "*.tar.gz" path: $(Agent.TempDirectory) + displayName: Download dotnet tool - script: | mkdir -p artifacts/build_data/snapshots @@ -5640,15 +5644,15 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download bundle nuget - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download bundle nuget artifact: bundle-nuget-package path: $(smokeTestAppDir)/artifacts - - task: DownloadPipelineArtifact@2 - displayName: Download Datadog.Trace package - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download Datadog.Trace package artifact: nuget-packages path: $(smokeTestAppDir)/artifacts @@ -5739,9 +5743,9 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download dotnet tool - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download dotnet tool artifact: runner-standalone-win-x64 patterns: "dd-trace-win-x64.zip" path: $(Agent.TempDirectory) @@ -5813,9 +5817,9 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download MSI to temp directory - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download MSI to temp directory artifact: windows-msi-$(targetPlatform) patterns: '**/*-$(targetPlatform).msi' path: $(Agent.TempDirectory) @@ -5887,9 +5891,9 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download MSI to temp directory - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download MSI to temp directory artifact: windows-msi-$(targetPlatform) patterns: '**/*-$(targetPlatform).msi' path: $(Agent.TempDirectory) @@ -5965,9 +5969,9 @@ stages: mkdir -p $(smokeTestAppDir)/artifacts displayName: Create test data directories - - task: DownloadPipelineArtifact@2 - displayName: Download tracer home zip - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download tracer home zip artifact: windows-tracer-home.zip path: $(smokeTestAppDir)/artifacts @@ -6030,15 +6034,15 @@ stages: targetShaId: $(targetShaId) targetBranch: $(targetBranch) - - task: DownloadPipelineArtifact@2 - displayName: Download tracer home zip - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download tracer home zip artifact: windows-tracer-home.zip path: $(smokeTestAppDir)/artifacts - - task: DownloadPipelineArtifact@2 - displayName: Download fleet installer to temp directory - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download fleet installer to temp directory artifact: fleet-installer path: $(smokeTestAppDir)/artifacts/installer @@ -6110,9 +6114,9 @@ stages: parameters: packageType: sdk # have to install the SDK (instead of runtime) so we get the aspnetcore runtime - - task: DownloadPipelineArtifact@2 - displayName: Download tool runner-dotnet-tool - inputs: + - template: steps/download-artifact.yml + parameters: + displayName: Download tool runner-dotnet-tool artifact: runner-dotnet-tool path: $(smokeTestAppDir)/artifacts From 91afabec669489217f7d77cf8b0253e5fa461006 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 28 May 2025 10:59:50 +0200 Subject: [PATCH 02/14] fix download-samples.yml --- .azure-pipelines/steps/download-samples.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/steps/download-samples.yml b/.azure-pipelines/steps/download-samples.yml index ff1f177985a9..723122f24e1a 100644 --- a/.azure-pipelines/steps/download-samples.yml +++ b/.azure-pipelines/steps/download-samples.yml @@ -5,7 +5,7 @@ parameters: steps: - template: steps/download-artifact.yml - inputs: + parameters: artifact: samples-standalone path: $(outputDir)/bin displayName: Download standalone samples @@ -13,7 +13,7 @@ steps: - ${{ if ne(parameters.framework, '') }}: - template: steps/download-artifact.yml - inputs: + parameters: artifact: samples-multi-version-${{ parameters.framework }} path: $(outputDir)/publish displayName: Download multi-version samples From 3397ed0133e2dad3391ed15f7bd540b386e29d34 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 28 May 2025 11:11:09 +0200 Subject: [PATCH 03/14] Fix --- .azure-pipelines/ultimate-pipeline.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 63eb949b5809..e0deaf3d0ca9 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -4336,13 +4336,13 @@ stages: - template: steps/install-latest-dotnet-sdk.yml - template: steps/download-artifact.yml - inputs: + parameters: artifact: execution_time_benchmarks_windows_x64_HttpMessageHandler_1 #only download the first lot, ignores retries path: $(System.DefaultWorkingDirectory)/artifacts/build_data/execution_benchmarks/current/execution_time_benchmarks_windows_x64_HttpMessageHandler_1 displayName: Download HttpMessageHandler - template: steps/download-artifact.yml - inputs: + parameters: artifact: execution_time_benchmarks_windows_x64_FakeDbCommand_1 #only download the first lot, ignores retries path: $(System.DefaultWorkingDirectory)/artifacts/build_data/execution_benchmarks/current/execution_time_benchmarks_windows_x64_FakeDbCommand_1 displayName: Download FakeDbCommand @@ -4415,7 +4415,7 @@ stages: includeX86: true - template: steps/download-artifact.yml - inputs: + parameters: artifact: windows-profiler-home path: $(monitoringHome) displayName: Download profiler windows native binary @@ -4506,7 +4506,7 @@ stages: targetBranch: $(targetBranch) - template: steps/download-artifact.yml - inputs: + parameters: artifact: linux-profiler-home-linux-x64 path: $(monitoringHome) displayName: Download profiler linux native binary @@ -5483,7 +5483,6 @@ stages: targetBranch: $(targetBranch) - template: steps/download-artifact.yml - displayName: Download bundle nuget parameters: artifact: bundle-nuget-package path: $(smokeTestAppDir)/artifacts From 22fb053d177026499e2b6043af85e9f1a455f2e3 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 28 May 2025 11:38:22 +0200 Subject: [PATCH 04/14] fix spacing --- .azure-pipelines/ultimate-pipeline.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index e0deaf3d0ca9..167f108dc748 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -2722,7 +2722,6 @@ stages: - template: steps/download-artifact.yml parameters: - inputs: artifact: linux-monitoring-home-$(artifactSuffix) path: $(monitoringHome) displayName: Download linux monitoring home @@ -4226,9 +4225,9 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download coverage report - patterns: '**/coverage.cobertura.xml' - path: $(Build.SourcesDirectory)/cover + displayName: Download coverage report + patterns: '**/coverage.cobertura.xml' + path: $(Build.SourcesDirectory)/cover - task: reportgenerator@4 inputs: @@ -4419,7 +4418,7 @@ stages: artifact: windows-profiler-home path: $(monitoringHome) displayName: Download profiler windows native binary - retryCountOnTaskFailure: 5 + retryCountOnTaskFailure: 5 - task: DotNetCoreCLI@2 inputs: @@ -4510,7 +4509,7 @@ stages: artifact: linux-profiler-home-linux-x64 path: $(monitoringHome) displayName: Download profiler linux native binary - retryCountOnTaskFailure: 5 + retryCountOnTaskFailure: 5 - task: DotNetCoreCLI@2 inputs: From 4adc42574307bc61853fd7a4dc903f040637268f Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 28 May 2025 11:39:45 +0200 Subject: [PATCH 05/14] fix template path --- .azure-pipelines/steps/restore-working-directory.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/steps/restore-working-directory.yml b/.azure-pipelines/steps/restore-working-directory.yml index 5cccd077d552..4bb22e91eded 100644 --- a/.azure-pipelines/steps/restore-working-directory.yml +++ b/.azure-pipelines/steps/restore-working-directory.yml @@ -4,7 +4,7 @@ parameters: default: 'build-windows-working-directory' steps: -- template: steps/download-artifact.yml +- template: download-artifact.yml parameters: artifact: ${{ parameters.artifact }} patterns: "**/@(bin|obj|packages)/**" From f400b50108e8779f0a194158b153345db63a0365 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 28 May 2025 11:41:49 +0200 Subject: [PATCH 06/14] fix more paths --- .azure-pipelines/steps/download-samples.yml | 2 +- .azure-pipelines/steps/restore-working-directory-for-tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/steps/download-samples.yml b/.azure-pipelines/steps/download-samples.yml index 723122f24e1a..b11277623542 100644 --- a/.azure-pipelines/steps/download-samples.yml +++ b/.azure-pipelines/steps/download-samples.yml @@ -12,7 +12,7 @@ steps: retryCountOnTaskFailure: 5 - ${{ if ne(parameters.framework, '') }}: - - template: steps/download-artifact.yml + - template: download-artifact.yml parameters: artifact: samples-multi-version-${{ parameters.framework }} path: $(outputDir)/publish diff --git a/.azure-pipelines/steps/restore-working-directory-for-tests.yml b/.azure-pipelines/steps/restore-working-directory-for-tests.yml index 99e19fd69615..34e6e3dd9a11 100644 --- a/.azure-pipelines/steps/restore-working-directory-for-tests.yml +++ b/.azure-pipelines/steps/restore-working-directory-for-tests.yml @@ -16,7 +16,7 @@ steps: echo "setting universalArtifactSuffix to ${output}" echo "##vso[task.setvariable variable=universalArtifactSuffix]${output}" -- template: ./steps/download-artifact.yml +- template: ./download-artifact.yml parameters: displayName: Download universal home binaries artifact: linux-universal-home-$(universalArtifactSuffix) From c5d1b804c9444d109c7259c830999675a94b7bf4 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 28 May 2025 11:45:36 +0200 Subject: [PATCH 07/14] fix --- .azure-pipelines/steps/download-samples.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/steps/download-samples.yml b/.azure-pipelines/steps/download-samples.yml index b11277623542..1c0eadb63d5f 100644 --- a/.azure-pipelines/steps/download-samples.yml +++ b/.azure-pipelines/steps/download-samples.yml @@ -4,7 +4,7 @@ parameters: default: '' steps: -- template: steps/download-artifact.yml +- template: download-artifact.yml parameters: artifact: samples-standalone path: $(outputDir)/bin From 76fd00e71cda5f4e9f56f11fb2866b1631e87828 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 28 May 2025 11:50:03 +0200 Subject: [PATCH 08/14] fix path --- .../steps/restore-working-directory-for-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/steps/restore-working-directory-for-tests.yml b/.azure-pipelines/steps/restore-working-directory-for-tests.yml index 34e6e3dd9a11..b1492fdc3bf6 100644 --- a/.azure-pipelines/steps/restore-working-directory-for-tests.yml +++ b/.azure-pipelines/steps/restore-working-directory-for-tests.yml @@ -16,13 +16,13 @@ steps: echo "setting universalArtifactSuffix to ${output}" echo "##vso[task.setvariable variable=universalArtifactSuffix]${output}" -- template: ./download-artifact.yml +- template: download-artifact.yml parameters: displayName: Download universal home binaries artifact: linux-universal-home-$(universalArtifactSuffix) path: $(monitoringHome)/${{ parameters.artifactSuffix }} -- template: ./steps/download-artifact.yml +- template: download-artifact.yml parameters: displayName: Download profiler binaries artifact: linux-profiler-home-${{ parameters.artifactSuffix }} From 7521fd996cc99dec062b10a2f7aaa2b8a7b5e80d Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Wed, 28 May 2025 12:24:28 +0200 Subject: [PATCH 09/14] increase default timeout --- .azure-pipelines/steps/download-artifact.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/steps/download-artifact.yml b/.azure-pipelines/steps/download-artifact.yml index 92cc6fa686a5..31aa9ba7c220 100644 --- a/.azure-pipelines/steps/download-artifact.yml +++ b/.azure-pipelines/steps/download-artifact.yml @@ -6,7 +6,7 @@ parameters: displayName: '' condition: '' # Defaults - timeoutInMinutes: 3 + timeoutInMinutes: 20 retryCountOnTaskFailure: 3 steps: From dca5a343c1d25b501beaf5f72521a5c31e8edcc5 Mon Sep 17 00:00:00 2001 From: NachoEchevarria <53266532+NachoEchevarria@users.noreply.github.com> Date: Wed, 28 May 2025 14:58:16 +0200 Subject: [PATCH 10/14] Update download-artifact.yml --- .azure-pipelines/steps/download-artifact.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure-pipelines/steps/download-artifact.yml b/.azure-pipelines/steps/download-artifact.yml index 31aa9ba7c220..270b67a81cf6 100644 --- a/.azure-pipelines/steps/download-artifact.yml +++ b/.azure-pipelines/steps/download-artifact.yml @@ -6,7 +6,7 @@ parameters: displayName: '' condition: '' # Defaults - timeoutInMinutes: 20 + timeoutInMinutes: 45 retryCountOnTaskFailure: 3 steps: @@ -18,4 +18,4 @@ steps: inputs: artifact: ${{ parameters.artifact }} path: ${{ parameters.path }} - patterns: ${{ parameters.patterns }} \ No newline at end of file + patterns: ${{ parameters.patterns }} From ff0d81cf0970088e2cad315dc1fd03f1476a4417 Mon Sep 17 00:00:00 2001 From: NachoEchevarria <53266532+NachoEchevarria@users.noreply.github.com> Date: Thu, 29 May 2025 11:01:01 +0200 Subject: [PATCH 11/14] Update .azure-pipelines/steps/download-artifact.yml Co-authored-by: Andrew Lock --- .azure-pipelines/steps/download-artifact.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/steps/download-artifact.yml b/.azure-pipelines/steps/download-artifact.yml index 270b67a81cf6..485a00d331da 100644 --- a/.azure-pipelines/steps/download-artifact.yml +++ b/.azure-pipelines/steps/download-artifact.yml @@ -6,7 +6,7 @@ parameters: displayName: '' condition: '' # Defaults - timeoutInMinutes: 45 + timeoutInMinutes: 10 retryCountOnTaskFailure: 3 steps: From 315f7159baf6558ab0ea7b3ea8bf4e78a85a6a8f Mon Sep 17 00:00:00 2001 From: NachoEchevarria <53266532+NachoEchevarria@users.noreply.github.com> Date: Thu, 29 May 2025 11:03:48 +0200 Subject: [PATCH 12/14] Update .azure-pipelines/steps/download-artifact.yml Co-authored-by: Andrew Lock --- .azure-pipelines/steps/download-artifact.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines/steps/download-artifact.yml b/.azure-pipelines/steps/download-artifact.yml index 485a00d331da..41f10b191e5f 100644 --- a/.azure-pipelines/steps/download-artifact.yml +++ b/.azure-pipelines/steps/download-artifact.yml @@ -11,7 +11,7 @@ parameters: steps: - task: DownloadPipelineArtifact@2 - displayName: ${{ parameters.displayName }} + displayName: "Download ${{ parameters.artifact }}" condition: ${{ parameters.condition }} timeoutInMinutes: ${{ parameters.timeoutInMinutes }} retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }} From 3c384459d191ebf2e097bcd87553cc70d632a6e9 Mon Sep 17 00:00:00 2001 From: NachoEchevarria <53266532+NachoEchevarria@users.noreply.github.com> Date: Thu, 29 May 2025 11:04:24 +0200 Subject: [PATCH 13/14] Update .azure-pipelines/steps/download-samples.yml Co-authored-by: Andrew Lock --- .azure-pipelines/steps/download-samples.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.azure-pipelines/steps/download-samples.yml b/.azure-pipelines/steps/download-samples.yml index 1c0eadb63d5f..7238de0a13cf 100644 --- a/.azure-pipelines/steps/download-samples.yml +++ b/.azure-pipelines/steps/download-samples.yml @@ -8,8 +8,6 @@ steps: parameters: artifact: samples-standalone path: $(outputDir)/bin - displayName: Download standalone samples - retryCountOnTaskFailure: 5 - ${{ if ne(parameters.framework, '') }}: - template: download-artifact.yml From 610d94b6c5b91788de15cb2ebdd81da7dfe686b6 Mon Sep 17 00:00:00 2001 From: NachoEchevarria Date: Thu, 29 May 2025 11:17:41 +0200 Subject: [PATCH 14/14] Remove displayName: Download... --- .azure-pipelines/steps/download-artifact.yml | 1 - .azure-pipelines/steps/download-samples.yml | 1 - .../restore-working-directory-for-tests.yml | 2 - .../steps/restore-working-directory.yml | 1 - .azure-pipelines/ultimate-pipeline.yml | 120 ------------------ 5 files changed, 125 deletions(-) diff --git a/.azure-pipelines/steps/download-artifact.yml b/.azure-pipelines/steps/download-artifact.yml index 41f10b191e5f..34ca6f217c1e 100644 --- a/.azure-pipelines/steps/download-artifact.yml +++ b/.azure-pipelines/steps/download-artifact.yml @@ -3,7 +3,6 @@ parameters: artifact: '' path: '' patterns: '' - displayName: '' condition: '' # Defaults timeoutInMinutes: 10 diff --git a/.azure-pipelines/steps/download-samples.yml b/.azure-pipelines/steps/download-samples.yml index 7238de0a13cf..03e5f299b07b 100644 --- a/.azure-pipelines/steps/download-samples.yml +++ b/.azure-pipelines/steps/download-samples.yml @@ -14,5 +14,4 @@ steps: parameters: artifact: samples-multi-version-${{ parameters.framework }} path: $(outputDir)/publish - displayName: Download multi-version samples retryCountOnTaskFailure: 5 \ No newline at end of file diff --git a/.azure-pipelines/steps/restore-working-directory-for-tests.yml b/.azure-pipelines/steps/restore-working-directory-for-tests.yml index b1492fdc3bf6..c53d030ed3f9 100644 --- a/.azure-pipelines/steps/restore-working-directory-for-tests.yml +++ b/.azure-pipelines/steps/restore-working-directory-for-tests.yml @@ -18,12 +18,10 @@ steps: - template: download-artifact.yml parameters: - displayName: Download universal home binaries artifact: linux-universal-home-$(universalArtifactSuffix) path: $(monitoringHome)/${{ parameters.artifactSuffix }} - template: download-artifact.yml parameters: - displayName: Download profiler binaries artifact: linux-profiler-home-${{ parameters.artifactSuffix }} path: $(monitoringHome) \ No newline at end of file diff --git a/.azure-pipelines/steps/restore-working-directory.yml b/.azure-pipelines/steps/restore-working-directory.yml index 4bb22e91eded..fa507d685a87 100644 --- a/.azure-pipelines/steps/restore-working-directory.yml +++ b/.azure-pipelines/steps/restore-working-directory.yml @@ -9,5 +9,4 @@ steps: artifact: ${{ parameters.artifact }} patterns: "**/@(bin|obj|packages)/**" path: $(System.DefaultWorkingDirectory) - displayName: 'Download working dir' retryCountOnTaskFailure: 5 \ No newline at end of file diff --git a/.azure-pipelines/ultimate-pipeline.yml b/.azure-pipelines/ultimate-pipeline.yml index 167f108dc748..20b6cc155e75 100644 --- a/.azure-pipelines/ultimate-pipeline.yml +++ b/.azure-pipelines/ultimate-pipeline.yml @@ -589,40 +589,34 @@ stages: parameters: artifact: linux-tracer-home-linux-x64 path: $(monitoringHome) - displayName: Download tracer linux native binary (linux-x64) condition: eq(variables['artifactSuffix'], 'linux-x64') - template: steps/download-artifact.yml parameters: artifact: linux-profiler-home-linux-x64 path: $(monitoringHome) - displayName: Download profiler linux native binary (linux-x64) condition: eq(variables['artifactSuffix'], 'linux-x64') - template: steps/download-artifact.yml parameters: artifact: dd-dotnet-linux-x64 path: $(monitoringHome)/linux-x64 - displayName: Download dd-dotnet (linux-x64) condition: eq(variables['artifactSuffix'], 'linux-x64') - template: steps/download-artifact.yml parameters: artifact: linux-tracer-home-linux-musl-x64 path: $(monitoringHome) - displayName: Download tracer linux native binary (linux-musl-x64) - template: steps/download-artifact.yml parameters: artifact: linux-profiler-home-linux-musl-x64 path: $(monitoringHome) - displayName: Download profiler linux native binary (linux-musl-x64) - template: steps/download-artifact.yml parameters: artifact: dd-dotnet-linux-musl-x64 path: $(monitoringHome)/linux-musl-x64 - displayName: Download dd-dotnet (linux-musl-x64) - script: | chmod +x $(monitoringHome)/linux-musl-x64/dd-dotnet @@ -634,7 +628,6 @@ stages: parameters: artifact: linux-universal-home-linux-x64 path: $(monitoringHome)/$(artifactSuffix) - displayName: Download universal native binaries - template: steps/run-in-docker.yml parameters: @@ -871,40 +864,34 @@ stages: parameters: artifact: linux-tracer-home-linux-arm64 path: $(monitoringHome) - displayName: Download tracer arm64 native binary condition: eq(variables['artifactSuffix'], 'linux-arm64') - template: steps/download-artifact.yml parameters: artifact: linux-profiler-home-linux-arm64 path: $(monitoringHome) - displayName: Download profiler arm64 native binary condition: eq(variables['artifactSuffix'], 'linux-arm64') - template: steps/download-artifact.yml parameters: artifact: dd-dotnet-linux-arm64 path: $(monitoringHome)/linux-arm64 - displayName: Download dd-dotnet linux-arm64 condition: eq(variables['artifactSuffix'], 'linux-arm64') - template: steps/download-artifact.yml parameters: artifact: linux-tracer-home-linux-musl-arm64 path: $(monitoringHome) - displayName: Download tracer linux-musl-arm64 native binary - template: steps/download-artifact.yml parameters: artifact: linux-profiler-home-linux-musl-arm64 path: $(monitoringHome) - displayName: Download profiler linux-musl-arm64 native binary - template: steps/download-artifact.yml parameters: artifact: dd-dotnet-linux-musl-arm64 path: $(monitoringHome)/linux-musl-arm64 - displayName: Download dd-dotnet linux-musl-arm64 - script: | chmod +x $(monitoringHome)/linux-musl-arm64/dd-dotnet @@ -916,7 +903,6 @@ stages: parameters: artifact: linux-universal-home-linux-arm64 path: $(monitoringHome)/$(artifactSuffix) - displayName: Download universal native binaries - template: steps/run-in-docker.yml parameters: @@ -1001,13 +987,11 @@ stages: parameters: artifact: build-macos-native_tracer path: $(monitoringHome) - displayName: Download native tracer - template: steps/download-artifact.yml parameters: artifact: build-macos-native_loader path: $(monitoringHome) - displayName: Download native loader and managed - publish: $(monitoringHome) displayName: Uploading combined macos profiler artifact @@ -1036,13 +1020,11 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download windows profiler home artifact: windows-profiler-home path: $(monitoringHome) - template: steps/download-artifact.yml parameters: - displayName: Download dd-dotnet win-x64 artifact: dd-dotnet-win-x64 path: $(monitoringHome)/win-x64 @@ -1380,7 +1362,6 @@ stages: parameters: artifact: build-macos-native_tracer path: $(monitoringHome) - displayName: Download native tracer - script: ./tracer/build.sh BuildAndRunManagedUnitTests --framework $(framework) --code-coverage-enabled $(CodeCoverageEnabled) displayName: Build and Test @@ -2046,7 +2027,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download MSI artifact: windows-msi-$(targetPlatform) path: $(System.DefaultWorkingDirectory)$(relativeMsiOutputDirectory) patterns: '**/*-$(targetPlatform).msi' @@ -2646,7 +2626,6 @@ stages: # windows-tracer-home.zip file contains profiler, tracer... - template: steps/download-artifact.yml parameters: - displayName: Download monitoring home zip artifact: windows-tracer-home.zip path: $(Agent.TempDirectory) patterns: "windows-tracer-home.zip" @@ -2724,13 +2703,11 @@ stages: parameters: artifact: linux-monitoring-home-$(artifactSuffix) path: $(monitoringHome) - displayName: Download linux monitoring home - template: steps/download-artifact.yml parameters: artifact: linux-profiler-symbols-$(artifactSuffix) path: $(monitoringHome) - displayName: Download linux debug symbols # when we build samples separately, we could run this step and the docker-compose one below in // # (currently the docker-compose step relies on serverless samples) @@ -3381,7 +3358,6 @@ stages: artifact: build-windows-working-directory path: $(System.DefaultWorkingDirectory) retryCountOnTaskFailure: 5 - displayName: Download working dir # Download everything to monitoring home # BuildBundleNuget moves everything to the required folders @@ -3392,11 +3368,9 @@ stages: **/*.so **/loader.conf path: $(monitoringHome) - displayName: Download linux tracer home - template: steps/download-artifact.yml parameters: - displayName: Download alpine tracer home artifact: linux-tracer-home-linux-musl-x64 patterns: | **/*.so @@ -3405,7 +3379,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download arm64 tracer home artifact: linux-tracer-home-linux-arm64 patterns: | **/*.so @@ -3414,7 +3387,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download alpine arm64 tracer home artifact: linux-tracer-home-linux-musl-arm64 patterns: | **/*.so @@ -3423,7 +3395,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download osx tracer home artifact: macos-tracer-home patterns: | **/*.dylib @@ -3432,14 +3403,12 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download windows profiler home artifact: windows-profiler-home patterns: "**/*.dll" path: $(monitoringHome) - template: steps/download-artifact.yml parameters: - displayName: Download linux profiler home artifact: linux-profiler-home-linux-x64 patterns: | **/*.so @@ -3448,7 +3417,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download alpine profiler home artifact: linux-profiler-home-linux-musl-x64 patterns: | **/*.so @@ -3457,7 +3425,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download arm64 profiler home artifact: linux-profiler-home-linux-arm64 patterns: | **/*.so @@ -3466,7 +3433,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download alpine arm64 profiler home artifact: linux-profiler-home-linux-musl-arm64 patterns: | **/*.so @@ -3475,55 +3441,46 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download dd-dotnet win-x64 artifact: dd-dotnet-win-x64 path: $(monitoringHome)/win-x64 - template: steps/download-artifact.yml parameters: - displayName: Download dd-dotnet linux-x64 artifact: dd-dotnet-linux-x64 path: $(monitoringHome)/linux-x64 - template: steps/download-artifact.yml parameters: - displayName: Download dd-dotnet linux-musl-x64 artifact: dd-dotnet-linux-musl-x64 path: $(monitoringHome)/linux-musl-x64 - template: steps/download-artifact.yml parameters: - displayName: Download dd-dotnet linux-arm64 artifact: dd-dotnet-linux-arm64 path: $(monitoringHome)/linux-arm64 - template: steps/download-artifact.yml parameters: - displayName: Download dd-dotnet linux-musl-arm64 artifact: dd-dotnet-linux-musl-arm64 path: $(monitoringHome)/linux-musl-arm64 - template: steps/download-artifact.yml parameters: - displayName: Download linux universal artifacts artifact: linux-universal-home-linux-x64 path: $(monitoringHome)/linux-x64 - template: steps/download-artifact.yml parameters: - displayName: Download linux universal artifacts artifact: linux-universal-home-linux-x64 path: $(monitoringHome)/linux-musl-x64 - template: steps/download-artifact.yml parameters: - displayName: Download linux universal artifacts artifact: linux-universal-home-linux-arm64 path: $(monitoringHome)/linux-arm64 - template: steps/download-artifact.yml parameters: - displayName: Download linux universal artifacts artifact: linux-universal-home-linux-arm64 path: $(monitoringHome)/linux-musl-arm64 @@ -3612,25 +3569,21 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download windows profiler home artifact: windows-profiler-home path: $(monitoringHome) - template: steps/download-artifact.yml parameters: - displayName: Download tool runner artifact: runner-dotnet-tool path: $(runnerTool) - template: steps/download-artifact.yml parameters: - displayName: Download standalone runner artifact: runner-standalone-win-$(targetPlatform) path: $(Agent.TempDirectory)/runner - template: steps/download-artifact.yml parameters: - displayName: Download dd-dotnet win-x64 artifact: dd-dotnet-win-x64 path: $(monitoringHome)/win-x64 @@ -3724,31 +3677,26 @@ stages: parameters: artifact: linux-profiler-home-$(artifactSuffix) path: $(monitoringHome) - displayName: Download profiler linux native binary - template: steps/download-artifact.yml parameters: artifact: runner-dotnet-tool path: $(runnerTool) - displayName: Download tool runner - template: steps/download-artifact.yml parameters: artifact: runner-standalone-$(artifactSuffix) path: $(Agent.TempDirectory)/runner - displayName: Download standalone runner - template: steps/download-artifact.yml parameters: artifact: dd-dotnet-$(artifactSuffix) path: $(monitoringHome)/$(artifactSuffix) - displayName: Download dd-dotnet $(artifactSuffix) - template: steps/download-artifact.yml parameters: artifact: linux-universal-home-linux-$(targetArch) path: $(monitoringHome)/$(artifactSuffix) - displayName: Download universal native binaries - task: ExtractFiles@1 inputs: @@ -3812,21 +3760,18 @@ stages: artifact: linux-packages-linux-musl-x64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) - displayName: Download linux Alpine tar packages - template: steps/download-artifact.yml parameters: artifact: linux-packages-linux-x64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) - displayName: Download linux x64 packages - template: steps/download-artifact.yml parameters: artifact: linux-packages-linux-arm64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) - displayName: Download linux Arm64 packages - bash: | TAR_NAME=$(basename $(Build.ArtifactStagingDirectory)/datadog-dotnet-apm-*.arm64.tar.gz) @@ -3854,25 +3799,21 @@ stages: parameters: artifact: linux-tracer-home-linux-x64-r2r path: $(Build.ArtifactStagingDirectory)/x64 - displayName: Download serverless tracer home x64 - template: steps/download-artifact.yml parameters: artifact: linux-universal-home-linux-x64 path: $(Build.ArtifactStagingDirectory)/x64 - displayName: Download serverless universal home x64 - template: steps/download-artifact.yml parameters: artifact: linux-tracer-home-linux-arm64-r2r path: $(Build.ArtifactStagingDirectory)/arm64 - displayName: Download serverless tracer home arm64 - template: steps/download-artifact.yml parameters: artifact: linux-universal-home-linux-arm64 path: $(Build.ArtifactStagingDirectory)/arm64 - displayName: Download serverless universal home arm64 # publish all tar files as single artifact - publish: "$(Build.ArtifactStagingDirectory)" @@ -3899,7 +3840,6 @@ stages: parameters: artifact: nuget-packages path: $(Build.ArtifactStagingDirectory) - displayName: Download NuGet packages # set the version from the package name - bash: | @@ -3914,110 +3854,92 @@ stages: parameters: artifact: linux-packages-linux-musl-x64 path: $(Build.ArtifactStagingDirectory) - displayName: Download linux Alpine packages - template: steps/download-artifact.yml parameters: artifact: linux-packages-linux-x64 path: $(Build.ArtifactStagingDirectory) - displayName: Download linux x64 packages - template: steps/download-artifact.yml parameters: artifact: linux-packages-linux-arm64 path: $(Build.ArtifactStagingDirectory) - displayName: Download linux Arm64 packages # Linux symbols - template: steps/download-artifact.yml parameters: artifact: linux-profiler-symbols-linux-musl-x64 path: $(Build.ArtifactStagingDirectory)/symbols - displayName: Download linux profiler Alpine symbols - template: steps/download-artifact.yml parameters: artifact: linux-profiler-symbols-linux-x64 path: $(Build.ArtifactStagingDirectory)/symbols - displayName: Download linux profiler Alpine symbols - template: steps/download-artifact.yml parameters: artifact: linux-profiler-symbols-linux-arm64 path: $(Build.ArtifactStagingDirectory)/symbols - displayName: Download linux profiler Arm64 symbols - template: steps/download-artifact.yml parameters: artifact: linux-profiler-symbols-linux-musl-arm64 path: $(Build.ArtifactStagingDirectory)/symbols - displayName: Download linux profiler Alpine Arm64 symbols - template: steps/download-artifact.yml parameters: artifact: linux-tracer-symbols-linux-musl-x64 path: $(Build.ArtifactStagingDirectory)/symbols - displayName: Download linux tracer Alpine symbols - template: steps/download-artifact.yml parameters: artifact: linux-tracer-symbols-linux-x64 path: $(Build.ArtifactStagingDirectory)/symbols - displayName: Download linux tracer x64 symbols - template: steps/download-artifact.yml parameters: artifact: linux-tracer-symbols-linux-arm64 path: $(Build.ArtifactStagingDirectory)/symbols - displayName: Download linux tracer Arm64 symbols - template: steps/download-artifact.yml parameters: artifact: linux-tracer-symbols-linux-musl-arm64 path: $(Build.ArtifactStagingDirectory)/symbols - displayName: Download linux tracer Alpine Arm64 symbols - template: steps/download-artifact.yml parameters: artifact: linux-universal-symbols-linux-x64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-x64 - displayName: Download linux universal libraries linux x64 symbols - template: steps/download-artifact.yml parameters: artifact: linux-universal-symbols-linux-x64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-musl-x64 - displayName: Download linux universal libraries linux musl x64 symbols - template: steps/download-artifact.yml parameters: artifact: linux-universal-symbols-linux-arm64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-arm64 - displayName: Download linux universal libraries linux arm64 symbols - template: steps/download-artifact.yml parameters: artifact: linux-universal-symbols-linux-arm64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-musl-arm64 - displayName: Download linux universal libraries linux musl arm64 symbols - template: steps/download-artifact.yml parameters: artifact: dd-dotnet-symbols-linux-x64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-x64 - displayName: Download dd-dotnet linux-x64 symbols - template: steps/download-artifact.yml parameters: artifact: dd-dotnet-symbols-linux-musl-x64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-musl-x64 - displayName: Download dd-dotnet linux-musl-x64 symbols - template: steps/download-artifact.yml parameters: artifact: dd-dotnet-symbols-linux-arm64 path: $(Build.ArtifactStagingDirectory)/symbols/linux-arm64 - displayName: Download dd-dotnet linux-arm64 symbols - bash: | tar -zcf $(Build.ArtifactStagingDirectory)/linux-native-symbols.tar.gz ./symbols @@ -4032,7 +3954,6 @@ stages: parameters: artifact: bundle-nuget-package path: $(Build.ArtifactStagingDirectory) - displayName: Download bundle nuget package # Don't include the Datadog.Trace.BenchmarkDotNet package in the release artifacts # as it currently doesn't work with v3. @@ -4048,42 +3969,36 @@ stages: artifact: runner-dotnet-tool patterns: "*.nupkg" path: $(Build.ArtifactStagingDirectory) - displayName: Download runner dotnet tool - template: steps/download-artifact.yml parameters: artifact: runner-standalone-win-x64 patterns: "*.zip" path: $(Build.ArtifactStagingDirectory) - displayName: Download standalone dotnet tool win-x64 - template: steps/download-artifact.yml parameters: artifact: runner-standalone-linux-x64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) - displayName: Download standalone dotnet tool linux-x64 - template: steps/download-artifact.yml parameters: artifact: runner-standalone-linux-musl-x64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) - displayName: Download standalone dotnet tool linux-musl-x64 - template: steps/download-artifact.yml parameters: artifact: runner-standalone-linux-arm64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) - displayName: Download standalone dotnet tool linux-arm64 - template: steps/download-artifact.yml parameters: artifact: runner-standalone-linux-musl-arm64 patterns: "*.tar.gz" path: $(Build.ArtifactStagingDirectory) - displayName: Download standalone dotnet tool linux-musl-arm64 # release artifacts - publish: "$(Build.ArtifactStagingDirectory)" @@ -4098,13 +4013,11 @@ stages: parameters: artifact: windows-tracer-home.zip path: $(Build.ArtifactStagingDirectory) - displayName: Download Windows tracer home - template: steps/download-artifact.yml parameters: artifact: windows-msi-x64 path: $(Build.ArtifactStagingDirectory) - displayName: Download x64 MSI # Download the artifacts required by the serverless layer and create the zip file # This exapands the directory - but we want a zip file, so re-zip it! @@ -4112,7 +4025,6 @@ stages: parameters: artifact: serverless-artifacts path: $(Agent.TempDirectory)/serverless-artifacts - displayName: Download serverless artifacts - bash: | cd $(Agent.TempDirectory)/serverless-artifacts @@ -4225,7 +4137,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download coverage report patterns: '**/coverage.cobertura.xml' path: $(Build.SourcesDirectory)/cover @@ -4283,7 +4194,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download windows native binary artifact: windows-tracer-home path: $(monitoringHome) retryCountOnTaskFailure: 5 @@ -4338,13 +4248,11 @@ stages: parameters: artifact: execution_time_benchmarks_windows_x64_HttpMessageHandler_1 #only download the first lot, ignores retries path: $(System.DefaultWorkingDirectory)/artifacts/build_data/execution_benchmarks/current/execution_time_benchmarks_windows_x64_HttpMessageHandler_1 - displayName: Download HttpMessageHandler - template: steps/download-artifact.yml parameters: artifact: execution_time_benchmarks_windows_x64_FakeDbCommand_1 #only download the first lot, ignores retries path: $(System.DefaultWorkingDirectory)/artifacts/build_data/execution_benchmarks/current/execution_time_benchmarks_windows_x64_FakeDbCommand_1 - displayName: Download FakeDbCommand - script: tracer\build.cmd CompareExecutionTimeBenchmarkResults displayName: Compare execution-time results @@ -4417,7 +4325,6 @@ stages: parameters: artifact: windows-profiler-home path: $(monitoringHome) - displayName: Download profiler windows native binary retryCountOnTaskFailure: 5 - task: DotNetCoreCLI@2 @@ -4508,7 +4415,6 @@ stages: parameters: artifact: linux-profiler-home-linux-x64 path: $(monitoringHome) - displayName: Download profiler linux native binary retryCountOnTaskFailure: 5 - task: DotNetCoreCLI@2 @@ -4661,7 +4567,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download linux-packages artifact: linux-packages-linux-x64 patterns: '**/*tar.gz' path: $(Build.ArtifactStagingDirectory) @@ -4724,7 +4629,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download Docker images artifact: system-test-docker-images path: $(Build.SourcesDirectory) @@ -4791,7 +4695,6 @@ stages: parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts - displayName: Download artifacts to smoke test directory - script: | mkdir -p artifacts/build_data/snapshots @@ -4875,7 +4778,6 @@ stages: parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts - displayName: Download artifacts to smoke test directory # Run the "normal" installer smoke tests - script: | @@ -4949,13 +4851,11 @@ stages: parameters: artifact: bundle-nuget-package path: $(smokeTestAppDir)/artifacts - displayName: Download bundle nuget - template: steps/download-artifact.yml parameters: artifact: nuget-packages path: $(smokeTestAppDir)/artifacts - displayName: Download Datadog.Trace package - script: | mkdir -p artifacts/build_data/snapshots @@ -5040,11 +4940,9 @@ stages: parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts - displayName: Download installer artifacts to smoke test directory - template: steps/download-artifact.yml parameters: - displayName: Download $(packageName) package artifact: nuget-packages itemPattern: "$(packageName).$(ToolVersion)$(packageVersionSuffix).nupkg" path: $(smokeTestAppDir)/artifacts @@ -5115,7 +5013,6 @@ stages: parameters: artifact: runner-dotnet-tool path: $(smokeTestAppDir)/artifacts - displayName: Download tool runner-dotnet-tool - script: | mkdir -p artifacts/build_data/snapshots @@ -5181,7 +5078,6 @@ stages: artifact: runner-standalone-$(platformSuffix) patterns: "*.tar.gz" path: $(Agent.TempDirectory) - displayName: Download tool runner-standalone-$(platformSuffix) - script: | mkdir -p artifacts/build_data/snapshots @@ -5253,14 +5149,12 @@ stages: parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts - displayName: Download artifacts to smoke test directory - template: steps/download-artifact.yml parameters: artifact: runner-standalone-$(platformSuffix) patterns: "*.tar.gz" path: $(Agent.TempDirectory) - displayName: Download tool runner-standalone-$(platformSuffix) - script: | mkdir -p artifacts/build_data/snapshots @@ -5327,7 +5221,6 @@ stages: parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts - displayName: Download artifacts to smoke test directory - script: | mkdir -p artifacts/build_data/snapshots @@ -5411,7 +5304,6 @@ stages: parameters: artifact: $(linuxArtifacts) path: $(smokeTestAppDir)/artifacts - displayName: Download artifacts to smoke test directory # Run the "normal" installer smoke tests - script: | @@ -5485,13 +5377,11 @@ stages: parameters: artifact: bundle-nuget-package path: $(smokeTestAppDir)/artifacts - displayName: Download bundle nuget - template: steps/download-artifact.yml parameters: artifact: nuget-packages path: $(smokeTestAppDir)/artifacts - displayName: Download Datadog.Trace package - script: | mkdir -p artifacts/build_data/snapshots @@ -5573,7 +5463,6 @@ stages: artifact: runner-standalone-$(platformSuffix) patterns: "*.tar.gz" path: $(Agent.TempDirectory) - displayName: Download dotnet tool - script: | mkdir -p artifacts/build_data/snapshots @@ -5644,13 +5533,11 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download bundle nuget artifact: bundle-nuget-package path: $(smokeTestAppDir)/artifacts - template: steps/download-artifact.yml parameters: - displayName: Download Datadog.Trace package artifact: nuget-packages path: $(smokeTestAppDir)/artifacts @@ -5743,7 +5630,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download dotnet tool artifact: runner-standalone-win-x64 patterns: "dd-trace-win-x64.zip" path: $(Agent.TempDirectory) @@ -5817,7 +5703,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download MSI to temp directory artifact: windows-msi-$(targetPlatform) patterns: '**/*-$(targetPlatform).msi' path: $(Agent.TempDirectory) @@ -5891,7 +5776,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download MSI to temp directory artifact: windows-msi-$(targetPlatform) patterns: '**/*-$(targetPlatform).msi' path: $(Agent.TempDirectory) @@ -5969,7 +5853,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download tracer home zip artifact: windows-tracer-home.zip path: $(smokeTestAppDir)/artifacts @@ -6034,13 +5917,11 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download tracer home zip artifact: windows-tracer-home.zip path: $(smokeTestAppDir)/artifacts - template: steps/download-artifact.yml parameters: - displayName: Download fleet installer to temp directory artifact: fleet-installer path: $(smokeTestAppDir)/artifacts/installer @@ -6114,7 +5995,6 @@ stages: - template: steps/download-artifact.yml parameters: - displayName: Download tool runner-dotnet-tool artifact: runner-dotnet-tool path: $(smokeTestAppDir)/artifacts