From a51d8f45f21a890202d2c6eecc84a82809769dd5 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Thu, 20 Jul 2023 13:24:06 -0700 Subject: [PATCH 1/8] Setup testing. --- azure-pipelines.yml | 160 ++++++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8878d1a3499..28d02768e22 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -276,9 +276,9 @@ jobs: jobTemplate: /eng/performance/scenarios.yml buildMachines: - win-x64 - - ubuntu-x64 + # - ubuntu-x64 - win-arm64 - - ubuntu-arm64-ampere + # - ubuntu-arm64-ampere isPublic: false jobParameters: kind: scenarios @@ -286,84 +286,84 @@ jobs: channels: - main - # Affinitized Scenario benchmarks (Initially just PDN) - - template: /eng/performance/build_machine_matrix.yml - parameters: - jobTemplate: /eng/performance/scenarios.yml - buildMachines: - - win-x64 - - win-arm64 - - win-arm64-ampere - isPublic: false - jobParameters: - kind: scenarios - projectFile: scenarios_affinitized.proj - channels: - - main - additionalJobIdentifier: 'Affinity_85' - affinity: '85' # (01010101) Enables alternating process threads to take hyperthreading into account - runEnvVars: - - DOTNET_GCgen0size=410000 # ~4MB - - DOTNET_GCHeapCount=4 - - DOTNET_GCTotalPhysicalMemory=400000000 # 16GB - - # Maui Android scenario benchmarks - - template: /eng/performance/build_machine_matrix.yml - parameters: - jobTemplate: /eng/performance/scenarios.yml - buildMachines: - - win-x64-android-arm64-pixel - - win-x64-android-arm64-galaxy - isPublic: false - jobParameters: - kind: maui_scenarios_android - projectFile: maui_scenarios_android.proj - dotnetVersionsLinks: - main: https://aka.ms/dotnet/sdk/maui/net8.0.json - - # Maui iOS scenario benchmarks - - template: /eng/performance/build_machine_matrix.yml - parameters: - jobTemplate: /eng/performance/scenarios.yml - buildMachines: - - osx-x64-ios-arm64 - isPublic: false - jobParameters: - kind: maui_scenarios_ios - projectFile: maui_scenarios_ios.proj - dotnetVersionsLinks: - main: https://aka.ms/dotnet/sdk/maui/net8.0.json - - ## Maui scenario benchmarks - #- template: /eng/performance/build_machine_matrix.yml - # parameters: - # jobTemplate: /eng/performance/scenarios.yml - # buildMachines: - # - win-x64 - # - ubuntu-x64 - # - win-arm64 - # - ubuntu-arm64-ampere - # isPublic: false - # jobParameters: - # kind: maui_scenarios - # projectFile: maui_scenarios.proj - # channels: - # - main - - # NativeAOT scenario benchmarks - - template: /eng/performance/build_machine_matrix.yml - parameters: - jobTemplate: /eng/performance/scenarios.yml - buildMachines: - - win-x64 - - ubuntu-x64 - - win-arm64 - isPublic: false - jobParameters: - kind: nativeaot_scenarios - projectFile: nativeaot_scenarios.proj - channels: - - main + # # Affinitized Scenario benchmarks (Initially just PDN) + # - template: /eng/performance/build_machine_matrix.yml + # parameters: + # jobTemplate: /eng/performance/scenarios.yml + # buildMachines: + # - win-x64 + # - win-arm64 + # - win-arm64-ampere + # isPublic: false + # jobParameters: + # kind: scenarios + # projectFile: scenarios_affinitized.proj + # channels: + # - main + # additionalJobIdentifier: 'Affinity_85' + # affinity: '85' # (01010101) Enables alternating process threads to take hyperthreading into account + # runEnvVars: + # - DOTNET_GCgen0size=410000 # ~4MB + # - DOTNET_GCHeapCount=4 + # - DOTNET_GCTotalPhysicalMemory=400000000 # 16GB + + # # Maui Android scenario benchmarks + # - template: /eng/performance/build_machine_matrix.yml + # parameters: + # jobTemplate: /eng/performance/scenarios.yml + # buildMachines: + # - win-x64-android-arm64-pixel + # - win-x64-android-arm64-galaxy + # isPublic: false + # jobParameters: + # kind: maui_scenarios_android + # projectFile: maui_scenarios_android.proj + # dotnetVersionsLinks: + # main: https://aka.ms/dotnet/sdk/maui/net8.0.json + + # # Maui iOS scenario benchmarks + # - template: /eng/performance/build_machine_matrix.yml + # parameters: + # jobTemplate: /eng/performance/scenarios.yml + # buildMachines: + # - osx-x64-ios-arm64 + # isPublic: false + # jobParameters: + # kind: maui_scenarios_ios + # projectFile: maui_scenarios_ios.proj + # dotnetVersionsLinks: + # main: https://aka.ms/dotnet/sdk/maui/net8.0.json + + # ## Maui scenario benchmarks + # #- template: /eng/performance/build_machine_matrix.yml + # # parameters: + # # jobTemplate: /eng/performance/scenarios.yml + # # buildMachines: + # # - win-x64 + # # - ubuntu-x64 + # # - win-arm64 + # # - ubuntu-arm64-ampere + # # isPublic: false + # # jobParameters: + # # kind: maui_scenarios + # # projectFile: maui_scenarios.proj + # # channels: + # # - main + + # # NativeAOT scenario benchmarks + # - template: /eng/performance/build_machine_matrix.yml + # parameters: + # jobTemplate: /eng/performance/scenarios.yml + # buildMachines: + # - win-x64 + # - ubuntu-x64 + # - win-arm64 + # isPublic: false + # jobParameters: + # kind: nativeaot_scenarios + # projectFile: nativeaot_scenarios.proj + # channels: + # - main ################################################ # Scheduled Private jobs From cae230f1b2de29fc8211eae4f4d31afcbb7c5bac Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Thu, 20 Jul 2023 13:42:38 -0700 Subject: [PATCH 2/8] Test how TARGET_FRAMEWORKS is set. --- eng/performance/scenarios.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/eng/performance/scenarios.yml b/eng/performance/scenarios.yml index 4c32a1a172f..cd150fee6b6 100644 --- a/eng/performance/scenarios.yml +++ b/eng/performance/scenarios.yml @@ -132,13 +132,15 @@ jobs: Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$(CorrelationStaging)dotnet" Write-Host "Set DOTNET_ROOT to $(CorrelationStaging)dotnet" displayName: Explicitly set DOTNET_ROOT + - powershell: | + Write-Host "##vso[task.setvariable variable=PERFLAB_TARGET_FRAMEWORKS;]net8.0" + Write-Host "Set PERFLAB_TARGET_FRAMEWORKS to net8.0" + displayName: Explicitly set PERFLAB_TARGET_FRAMEWORKS - ${{ if eq(parameters.osName, 'windows') }}: - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e displayName: Copy python libraries and NuGet.config - - script: $(CorrelationStaging)dotnet\dotnet publish -c Release -o $(CorrelationStaging)startup -f $(PERFLAB_Framework) -r win-${{parameters.architecture}} --self-contained $(Build.SourcesDirectory)\src\tools\ScenarioMeasurement\Startup\Startup.csproj -p:DisableTransitiveFrameworkReferenceDownloads=true + - script: $(CorrelationStaging)dotnet\dotnet publish -c Release -o $(CorrelationStaging)startup -f $(PERFLAB_TARGET_FRAMEWORKS) -r win-${{parameters.architecture}} --self-contained $(Build.SourcesDirectory)\src\tools\ScenarioMeasurement\Startup\Startup.csproj -p:DisableTransitiveFrameworkReferenceDownloads=true displayName: Build startup tool - env: - PERFLAB_TARGET_FRAMEWORKS: $(PERFLAB_Framework) - script: $(CorrelationStaging)dotnet\dotnet publish -c Release -o $(CorrelationStaging)SOD -f $(PERFLAB_Framework) -r win-${{parameters.architecture}} --self-contained $(Build.SourcesDirectory)\src\tools\ScenarioMeasurement\SizeOnDisk\SizeOnDisk.csproj -p:DisableTransitiveFrameworkReferenceDownloads=true displayName: Build SOD tool env: From 8d4249bf20d37cee3907676e0b745319f5bf45d6 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 21 Jul 2023 11:53:42 -0700 Subject: [PATCH 3/8] Test explicitly adding DOTNET_ROOT to Path. --- eng/performance/scenarios.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/performance/scenarios.yml b/eng/performance/scenarios.yml index cd150fee6b6..4a2eec00a4e 100644 --- a/eng/performance/scenarios.yml +++ b/eng/performance/scenarios.yml @@ -136,6 +136,10 @@ jobs: Write-Host "##vso[task.setvariable variable=PERFLAB_TARGET_FRAMEWORKS;]net8.0" Write-Host "Set PERFLAB_TARGET_FRAMEWORKS to net8.0" displayName: Explicitly set PERFLAB_TARGET_FRAMEWORKS + - powershell: | + Write-Host "##vso[task.setvariable variable=PATH;]$(DOTNET_ROOT);$(PATH))" + Write-Host "Prepend PATH with $(DOTNET_ROOT)" + displayName: Explicitly set PATH - ${{ if eq(parameters.osName, 'windows') }}: - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e displayName: Copy python libraries and NuGet.config From 9163d525986609c2ffb741a07b026173e0365e28 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 21 Jul 2023 12:19:38 -0700 Subject: [PATCH 4/8] Try with just prepending the path. --- eng/performance/scenarios.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/eng/performance/scenarios.yml b/eng/performance/scenarios.yml index 4a2eec00a4e..ea0e8d85c12 100644 --- a/eng/performance/scenarios.yml +++ b/eng/performance/scenarios.yml @@ -129,16 +129,8 @@ jobs: - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet $(runEnvVarsParam) $(AffinityParam) displayName: Run ci_setup.py with dotnetVersionsLinks - powershell: | - Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$(CorrelationStaging)dotnet" - Write-Host "Set DOTNET_ROOT to $(CorrelationStaging)dotnet" - displayName: Explicitly set DOTNET_ROOT - - powershell: | - Write-Host "##vso[task.setvariable variable=PERFLAB_TARGET_FRAMEWORKS;]net8.0" - Write-Host "Set PERFLAB_TARGET_FRAMEWORKS to net8.0" - displayName: Explicitly set PERFLAB_TARGET_FRAMEWORKS - - powershell: | - Write-Host "##vso[task.setvariable variable=PATH;]$(DOTNET_ROOT);$(PATH))" - Write-Host "Prepend PATH with $(DOTNET_ROOT)" + Write-Host "##vso[task.setvariable variable=PATH;]$(CorrelationStaging)dotnet;$(PATH))" + Write-Host "Prepend PATH with $(CorrelationStaging)dotnet" displayName: Explicitly set PATH - ${{ if eq(parameters.osName, 'windows') }}: - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e From c88c6954076f26cc4839410f37d32137572211f3 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 21 Jul 2023 12:22:30 -0700 Subject: [PATCH 5/8] Revert "Try with just prepending the path." This reverts commit 9163d525986609c2ffb741a07b026173e0365e28. --- eng/performance/scenarios.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/eng/performance/scenarios.yml b/eng/performance/scenarios.yml index ea0e8d85c12..4a2eec00a4e 100644 --- a/eng/performance/scenarios.yml +++ b/eng/performance/scenarios.yml @@ -129,8 +129,16 @@ jobs: - script: $(Python) scripts/ci_setup.py --channel $(_Channel) --dotnet-versions $(DotnetVersion) --architecture ${{parameters.architecture}} --perf-hash $(Build.SourceVersion) --queue ${{parameters.queue}} --build-number $(Build.BuildNumber) --build-configs $(_Configs) --output-file $(CorrelationStaging)machine-setup$(ScriptExtension) --install-dir $(CorrelationStaging)dotnet $(runEnvVarsParam) $(AffinityParam) displayName: Run ci_setup.py with dotnetVersionsLinks - powershell: | - Write-Host "##vso[task.setvariable variable=PATH;]$(CorrelationStaging)dotnet;$(PATH))" - Write-Host "Prepend PATH with $(CorrelationStaging)dotnet" + Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$(CorrelationStaging)dotnet" + Write-Host "Set DOTNET_ROOT to $(CorrelationStaging)dotnet" + displayName: Explicitly set DOTNET_ROOT + - powershell: | + Write-Host "##vso[task.setvariable variable=PERFLAB_TARGET_FRAMEWORKS;]net8.0" + Write-Host "Set PERFLAB_TARGET_FRAMEWORKS to net8.0" + displayName: Explicitly set PERFLAB_TARGET_FRAMEWORKS + - powershell: | + Write-Host "##vso[task.setvariable variable=PATH;]$(DOTNET_ROOT);$(PATH))" + Write-Host "Prepend PATH with $(DOTNET_ROOT)" displayName: Explicitly set PATH - ${{ if eq(parameters.osName, 'windows') }}: - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e From 377862427f1ca0b1e8948b5102cd306ac2899296 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 21 Jul 2023 12:24:44 -0700 Subject: [PATCH 6/8] Revert "Test how TARGET_FRAMEWORKS is set." This reverts commit cae230f1b2de29fc8211eae4f4d31afcbb7c5bac. --- eng/performance/scenarios.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/eng/performance/scenarios.yml b/eng/performance/scenarios.yml index 4a2eec00a4e..7c86284e60d 100644 --- a/eng/performance/scenarios.yml +++ b/eng/performance/scenarios.yml @@ -133,18 +133,16 @@ jobs: Write-Host "Set DOTNET_ROOT to $(CorrelationStaging)dotnet" displayName: Explicitly set DOTNET_ROOT - powershell: | - Write-Host "##vso[task.setvariable variable=PERFLAB_TARGET_FRAMEWORKS;]net8.0" - Write-Host "Set PERFLAB_TARGET_FRAMEWORKS to net8.0" - displayName: Explicitly set PERFLAB_TARGET_FRAMEWORKS - - powershell: | - Write-Host "##vso[task.setvariable variable=PATH;]$(DOTNET_ROOT);$(PATH))" + Write-Host "##vso[task.setvariable variable=PATH;]$(DOTNET_ROOT);$(PATH)" Write-Host "Prepend PATH with $(DOTNET_ROOT)" displayName: Explicitly set PATH - ${{ if eq(parameters.osName, 'windows') }}: - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e displayName: Copy python libraries and NuGet.config - - script: $(CorrelationStaging)dotnet\dotnet publish -c Release -o $(CorrelationStaging)startup -f $(PERFLAB_TARGET_FRAMEWORKS) -r win-${{parameters.architecture}} --self-contained $(Build.SourcesDirectory)\src\tools\ScenarioMeasurement\Startup\Startup.csproj -p:DisableTransitiveFrameworkReferenceDownloads=true + - script: $(CorrelationStaging)dotnet\dotnet publish -c Release -o $(CorrelationStaging)startup -f $(PERFLAB_Framework) -r win-${{parameters.architecture}} --self-contained $(Build.SourcesDirectory)\src\tools\ScenarioMeasurement\Startup\Startup.csproj -p:DisableTransitiveFrameworkReferenceDownloads=true displayName: Build startup tool + env: + PERFLAB_TARGET_FRAMEWORKS: $(PERFLAB_Framework) - script: $(CorrelationStaging)dotnet\dotnet publish -c Release -o $(CorrelationStaging)SOD -f $(PERFLAB_Framework) -r win-${{parameters.architecture}} --self-contained $(Build.SourcesDirectory)\src\tools\ScenarioMeasurement\SizeOnDisk\SizeOnDisk.csproj -p:DisableTransitiveFrameworkReferenceDownloads=true displayName: Build SOD tool env: From c967a92201fa978f96ed6094b0b7358aab4d121f Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 21 Jul 2023 12:26:08 -0700 Subject: [PATCH 7/8] Revert "Setup testing." This reverts commit a51d8f45f21a890202d2c6eecc84a82809769dd5. --- azure-pipelines.yml | 160 ++++++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 28d02768e22..8878d1a3499 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -276,9 +276,9 @@ jobs: jobTemplate: /eng/performance/scenarios.yml buildMachines: - win-x64 - # - ubuntu-x64 + - ubuntu-x64 - win-arm64 - # - ubuntu-arm64-ampere + - ubuntu-arm64-ampere isPublic: false jobParameters: kind: scenarios @@ -286,84 +286,84 @@ jobs: channels: - main - # # Affinitized Scenario benchmarks (Initially just PDN) - # - template: /eng/performance/build_machine_matrix.yml - # parameters: - # jobTemplate: /eng/performance/scenarios.yml - # buildMachines: - # - win-x64 - # - win-arm64 - # - win-arm64-ampere - # isPublic: false - # jobParameters: - # kind: scenarios - # projectFile: scenarios_affinitized.proj - # channels: - # - main - # additionalJobIdentifier: 'Affinity_85' - # affinity: '85' # (01010101) Enables alternating process threads to take hyperthreading into account - # runEnvVars: - # - DOTNET_GCgen0size=410000 # ~4MB - # - DOTNET_GCHeapCount=4 - # - DOTNET_GCTotalPhysicalMemory=400000000 # 16GB - - # # Maui Android scenario benchmarks - # - template: /eng/performance/build_machine_matrix.yml - # parameters: - # jobTemplate: /eng/performance/scenarios.yml - # buildMachines: - # - win-x64-android-arm64-pixel - # - win-x64-android-arm64-galaxy - # isPublic: false - # jobParameters: - # kind: maui_scenarios_android - # projectFile: maui_scenarios_android.proj - # dotnetVersionsLinks: - # main: https://aka.ms/dotnet/sdk/maui/net8.0.json - - # # Maui iOS scenario benchmarks - # - template: /eng/performance/build_machine_matrix.yml - # parameters: - # jobTemplate: /eng/performance/scenarios.yml - # buildMachines: - # - osx-x64-ios-arm64 - # isPublic: false - # jobParameters: - # kind: maui_scenarios_ios - # projectFile: maui_scenarios_ios.proj - # dotnetVersionsLinks: - # main: https://aka.ms/dotnet/sdk/maui/net8.0.json - - # ## Maui scenario benchmarks - # #- template: /eng/performance/build_machine_matrix.yml - # # parameters: - # # jobTemplate: /eng/performance/scenarios.yml - # # buildMachines: - # # - win-x64 - # # - ubuntu-x64 - # # - win-arm64 - # # - ubuntu-arm64-ampere - # # isPublic: false - # # jobParameters: - # # kind: maui_scenarios - # # projectFile: maui_scenarios.proj - # # channels: - # # - main - - # # NativeAOT scenario benchmarks - # - template: /eng/performance/build_machine_matrix.yml - # parameters: - # jobTemplate: /eng/performance/scenarios.yml - # buildMachines: - # - win-x64 - # - ubuntu-x64 - # - win-arm64 - # isPublic: false - # jobParameters: - # kind: nativeaot_scenarios - # projectFile: nativeaot_scenarios.proj - # channels: - # - main + # Affinitized Scenario benchmarks (Initially just PDN) + - template: /eng/performance/build_machine_matrix.yml + parameters: + jobTemplate: /eng/performance/scenarios.yml + buildMachines: + - win-x64 + - win-arm64 + - win-arm64-ampere + isPublic: false + jobParameters: + kind: scenarios + projectFile: scenarios_affinitized.proj + channels: + - main + additionalJobIdentifier: 'Affinity_85' + affinity: '85' # (01010101) Enables alternating process threads to take hyperthreading into account + runEnvVars: + - DOTNET_GCgen0size=410000 # ~4MB + - DOTNET_GCHeapCount=4 + - DOTNET_GCTotalPhysicalMemory=400000000 # 16GB + + # Maui Android scenario benchmarks + - template: /eng/performance/build_machine_matrix.yml + parameters: + jobTemplate: /eng/performance/scenarios.yml + buildMachines: + - win-x64-android-arm64-pixel + - win-x64-android-arm64-galaxy + isPublic: false + jobParameters: + kind: maui_scenarios_android + projectFile: maui_scenarios_android.proj + dotnetVersionsLinks: + main: https://aka.ms/dotnet/sdk/maui/net8.0.json + + # Maui iOS scenario benchmarks + - template: /eng/performance/build_machine_matrix.yml + parameters: + jobTemplate: /eng/performance/scenarios.yml + buildMachines: + - osx-x64-ios-arm64 + isPublic: false + jobParameters: + kind: maui_scenarios_ios + projectFile: maui_scenarios_ios.proj + dotnetVersionsLinks: + main: https://aka.ms/dotnet/sdk/maui/net8.0.json + + ## Maui scenario benchmarks + #- template: /eng/performance/build_machine_matrix.yml + # parameters: + # jobTemplate: /eng/performance/scenarios.yml + # buildMachines: + # - win-x64 + # - ubuntu-x64 + # - win-arm64 + # - ubuntu-arm64-ampere + # isPublic: false + # jobParameters: + # kind: maui_scenarios + # projectFile: maui_scenarios.proj + # channels: + # - main + + # NativeAOT scenario benchmarks + - template: /eng/performance/build_machine_matrix.yml + parameters: + jobTemplate: /eng/performance/scenarios.yml + buildMachines: + - win-x64 + - ubuntu-x64 + - win-arm64 + isPublic: false + jobParameters: + kind: nativeaot_scenarios + projectFile: nativeaot_scenarios.proj + channels: + - main ################################################ # Scheduled Private jobs From 5a4089f25bc3a580458079e10f5ffc73295c81d3 Mon Sep 17 00:00:00 2001 From: Parker Bibus Date: Fri, 21 Jul 2023 12:33:10 -0700 Subject: [PATCH 8/8] Create separate path setting for windows and non-windows. --- eng/performance/scenarios.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/eng/performance/scenarios.yml b/eng/performance/scenarios.yml index 7c86284e60d..e45b67d0226 100644 --- a/eng/performance/scenarios.yml +++ b/eng/performance/scenarios.yml @@ -132,10 +132,17 @@ jobs: Write-Host "##vso[task.setvariable variable=DOTNET_ROOT;]$(CorrelationStaging)dotnet" Write-Host "Set DOTNET_ROOT to $(CorrelationStaging)dotnet" displayName: Explicitly set DOTNET_ROOT + # Set PATH + - script: | + echo "##vso[task.setvariable variable=PATH;]$(DOTNET_ROOT):$(PATH)" + echo "Set PATH to $(DOTNET_ROOT):$(PATH)" + displayName: Explicitly set PATH (Non-Windows) + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - powershell: | Write-Host "##vso[task.setvariable variable=PATH;]$(DOTNET_ROOT);$(PATH)" - Write-Host "Prepend PATH with $(DOTNET_ROOT)" - displayName: Explicitly set PATH + Write-Host "Set PATH to $(DOTNET_ROOT);$(PATH)" + displayName: Explicitly set PATH (Windows) + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if eq(parameters.osName, 'windows') }}: - script: xcopy .\NuGet.config $(CorrelationStaging) && xcopy .\scripts $(CorrelationStaging)scripts\/e && xcopy .\src\scenarios\shared $(CorrelationStaging)shared\/e && xcopy .\src\scenarios\staticdeps $(CorrelationStaging)staticdeps\/e displayName: Copy python libraries and NuGet.config