diff --git a/eng/pipelines/coreclr/perf-wasm-jobs.yml b/eng/pipelines/coreclr/perf-wasm-jobs.yml index ee36c3e41cff37..cf2b88f507c94a 100644 --- a/eng/pipelines/coreclr/perf-wasm-jobs.yml +++ b/eng/pipelines/coreclr/perf-wasm-jobs.yml @@ -118,7 +118,7 @@ jobs: logicalmachine: 'perftiger' javascriptEngine: 'v8' # For working with a newer sdk, and previous tfm (eg. 9.0 sdk, and net8.0 tfm) - additionalSetupParameters: '--dotnet-versions 8.0.0' + #additionalSetupParameters: '--dotnet-versions 8.0.0' collectHelixLogsScript: ${{ parameters.collectHelixLogsScript }} compare: ${{ parameters.compare }} onlySanityCheck: ${{ parameters.onlySanityCheck }} @@ -145,7 +145,7 @@ jobs: logicalmachine: 'perftiger' javascriptEngine: 'v8' # For working with a newer sdk, and previous tfm (eg. 9.0 sdk, and net8.0 tfm) - additionalSetupParameters: '--dotnet-versions 8.0.0' # passed to ci_setup.py + #additionalSetupParameters: '--dotnet-versions 8.0.0' # passed to ci_setup.py collectHelixLogsScript: ${{ parameters.collectHelixLogsScript }} compare: ${{ parameters.compare }} onlySanityCheck: ${{ parameters.onlySanityCheck }} @@ -169,7 +169,7 @@ jobs: runKind: blazor_scenarios runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml # For working with a newer sdk, and previous tfm (eg. 9.0 sdk, and net8.0 tfm) - additionalSetupParameters: '--dotnetversions 8.0.0' # passed to performance-setup.sh + #additionalSetupParameters: '--dotnetversions 8.0.0' # passed to performance-setup.sh logicalmachine: 'perftiger' downloadSpecificBuild: ${{ parameters.downloadSpecificBuild }} perfForkToUse: ${{ parameters.perfForkToUse }} @@ -192,7 +192,7 @@ jobs: runKind: blazor_scenarios runJobTemplate: /eng/pipelines/coreclr/templates/run-scenarios-job.yml # For working with a newer sdk, and previous tfm (eg. 9.0 sdk, and net8.0 tfm) - additionalSetupParameters: '--dotnetversions 8.0.0' # passed to performance-setup.sh + #additionalSetupParameters: '--dotnetversions 8.0.0' # passed to performance-setup.sh logicalmachine: 'perftiger' downloadSpecificBuild: ${{ parameters.downloadSpecificBuild }} perfForkToUse: ${{ parameters.perfForkToUse }} diff --git a/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml b/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml index 4f5a1113c3eb0c..10c6cdba7a618f 100644 --- a/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml +++ b/eng/pipelines/coreclr/perf-wasm-prepare-artifacts-steps.yml @@ -16,7 +16,8 @@ steps: cp -r $(Build.SourcesDirectory)/artifacts/bin/dotnet-latest $(Build.SourcesDirectory)/artifacts/staging && cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.runtime.browser-wasm $(Build.SourcesDirectory)/artifacts/staging && cp -r $(Build.SourcesDirectory)/artifacts/bin/microsoft.netcore.app.ref $(Build.SourcesDirectory)/artifacts/staging && - cp -r $(Build.SourcesDirectory)/artifacts/packages/${{ parameters.configForBuild }}/Shipping/Microsoft.NET.Sdk.WebAssembly.Pack* $(Build.SourcesDirectory)/artifacts/staging/built-nugets + cp -r $(Build.SourcesDirectory)/artifacts/packages/${{ parameters.configForBuild }}/Shipping/Microsoft.NET.Sdk.WebAssembly.Pack* $(Build.SourcesDirectory)/artifacts/staging/built-nugets && + cp -r $(Build.SourcesDirectory)/artifacts/packages/${{ parameters.configForBuild }}/Shipping/Microsoft.NETCore.App.Ref* $(Build.SourcesDirectory)/artifacts/staging/built-nugets displayName: "Prepare artifacts staging directory" - template: /eng/pipelines/common/upload-artifact-step.yml diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml index 794659045388c1..da4ccd0a72eedc 100644 --- a/eng/pipelines/coreclr/templates/run-performance-job.yml +++ b/eng/pipelines/coreclr/templates/run-performance-job.yml @@ -83,6 +83,7 @@ jobs: - HelixPreCommandsWasmOnLinux: echo - HelixPreCommandStemWindows: 'set ORIGPYPATH=%PYTHONPATH%;py -m pip install -U pip;py -3 -m venv %HELIX_WORKITEM_PAYLOAD%\.venv;call %HELIX_WORKITEM_PAYLOAD%\.venv\Scripts\activate.bat;set PYTHONPATH=;py -3 -m pip install -U pip;py -3 -m pip install urllib3==1.26.15;py -3 -m pip install azure.storage.blob==12.0.0;py -3 -m pip install azure.storage.queue==12.0.0;set "PERFLAB_UPLOAD_TOKEN=$(HelixPerfUploadTokenValue)"' - HelixPreCommandStemLinux: >- + export RestoreAdditionalProjectSources=$HELIX_CORRELATION_PAYLOAD/built-nugets export ORIGPYPATH=$PYTHONPATH export CRYPTOGRAPHY_ALLOW_OPENSSL_102=true; echo "** Installing prerequistes **"; diff --git a/eng/testing/performance/microbenchmarks.proj b/eng/testing/performance/microbenchmarks.proj index 309be61ffdb8b8..556d4cfc7ddcb7 100644 --- a/eng/testing/performance/microbenchmarks.proj +++ b/eng/testing/performance/microbenchmarks.proj @@ -80,6 +80,8 @@ 6:00 1:30 + + $(ExtraBenchmarkDotNetArguments) --filter System.Tests.Perf_*