diff --git a/eng/pipelines/coreclr/templates/run-performance-job.yml b/eng/pipelines/coreclr/templates/run-performance-job.yml
index d4e25aff3f498..218c8262ad52d 100644
--- a/eng/pipelines/coreclr/templates/run-performance-job.yml
+++ b/eng/pipelines/coreclr/templates/run-performance-job.yml
@@ -64,29 +64,35 @@ jobs:
- HelixPerfUploadTokenValue: '$(PerfCommandUploadTokenLinux)'
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.osGroup, 'windows')) }}:
- HelixPerfUploadTokenValue: '$(PerfCommandUploadToken)'
+ - ${{ if eq(parameters.runtimeType, 'wasm') }}:
+ - HelixPreCommandsWasmOnLinux: >-
+ sudo apt-get -y remove nodejs &&
+ curl -fsSL https://deb.nodesource.com/setup_14.x | sudo -E bash - &&
+ sudo apt-get -y install nodejs &&
+ npm install --prefix $HELIX_WORKITEM_PAYLOAD jsvu -g &&
+ $HELIX_WORKITEM_PAYLOAD/bin/jsvu --os=linux64 --engines=v8,javascriptcore
+ - ${{ if ne(parameters.runtimeType, 'wasm') }}:
+ - 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 azure.storage.blob==12.0.0;py -3 -m pip install azure.storage.queue==12.0.0;set "PERFLAB_UPLOAD_TOKEN=$(HelixPerfUploadTokenValue)"'
- HelixPreCommandStemLinux: >-
export ORIGPYPATH=$PYTHONPATH
export CRYPTOGRAPHY_ALLOW_OPENSSL_102=true;
echo "** Installing prerequistes **";
- python3 -m pip install -U pip &&
+ python3 -m pip install --user -U pip &&
sudo apt-get -y install python3-venv &&
python3 -m venv $HELIX_WORKITEM_PAYLOAD/.venv &&
ls -l $HELIX_WORKITEM_PAYLOAD/.venv/bin/activate &&
export PYTHONPATH= &&
- python3 -m pip install -U pip &&
- pip3 install azure.storage.blob==12.0.0 &&
- pip3 install azure.storage.queue==12.0.0 &&
+ python3 -m pip install --user -U pip &&
+ pip3 install --user azure.storage.blob==12.0.0 &&
+ pip3 install --user azure.storage.queue==12.0.0 &&
sudo apt-get update &&
sudo apt -y install curl dirmngr apt-transport-https lsb-release ca-certificates &&
- curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash - &&
- sudo apt-get -y install nodejs &&
- npm install --prefix $HELIX_WORKITEM_PAYLOAD jsvu -g &&
- $HELIX_WORKITEM_PAYLOAD/bin/jsvu --os=linux64 --engines=v8,javascriptcore &&
- export PERFLAB_UPLOAD_TOKEN="$(HelixPerfUploadTokenValue)" &&
- export PERF_PREREQS_INSTALLED=1;
- test "x$PERF_PREREQS_INSTALLED" = "x1" || echo "** Error: Failed to install prerequites **"
- - HelixPreCommandStemMusl: 'export ORIGPYPATH=$PYTHONPATH;sudo apk add icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib cargo;sudo apk add libgdiplus --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing; python3 -m venv $HELIX_WORKITEM_PAYLOAD/.venv;source $HELIX_WORKITEM_PAYLOAD/.venv/bin/activate;export PYTHONPATH=;python3 -m pip install -U pip;pip3 install azure.storage.blob==12.7.1;pip3 install azure.storage.queue==12.1.5;export PERFLAB_UPLOAD_TOKEN="$(HelixPerfUploadTokenValue)"'
+ $(HelixPreCommandsWasmOnLinux) &&
+ export PERFLAB_UPLOAD_TOKEN="$(HelixPerfUploadTokenValue)"
+ || export PERF_PREREQS_INSTALL_FAILED=1;
+ test "x$PERF_PREREQS_INSTALL_FAILED" = "x1" && echo "** Error: Failed to install prerequites **"
+ - HelixPreCommandStemMusl: 'export ORIGPYPATH=$PYTHONPATH;sudo apk add icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib cargo;sudo apk add libgdiplus --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing; python3 -m venv $HELIX_WORKITEM_PAYLOAD/.venv;source $HELIX_WORKITEM_PAYLOAD/.venv/bin/activate;export PYTHONPATH=;python3 -m pip install --user -U pip;pip3 install --user azure.storage.blob==12.7.1;pip3 install --user azure.storage.queue==12.1.5;export PERFLAB_UPLOAD_TOKEN="$(HelixPerfUploadTokenValue)"'
- ExtraMSBuildLogsWindows: 'set MSBUILDDEBUGCOMM=1;set "MSBUILDDEBUGPATH=%HELIX_WORKITEM_UPLOAD_ROOT%"'
- ExtraMSBuildLogsLinux: 'export MSBUILDDEBUGCOMM=1;export "MSBUILDDEBUGPATH=$HELIX_WORKITEM_UPLOAD_ROOT"'
- HelixPreCommand: ''
diff --git a/eng/testing/performance/microbenchmarks.proj b/eng/testing/performance/microbenchmarks.proj
index 1331e1e7a811c..3793751775f92 100644
--- a/eng/testing/performance/microbenchmarks.proj
+++ b/eng/testing/performance/microbenchmarks.proj
@@ -132,10 +132,10 @@
$(WorkItemDirectory)
$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"
- if [ "x$PERF_PREREQS_INSTALLED" = "x1" ]; then
- $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)";
+ if [ "x$PERF_PREREQS_INSTALL_FAILED" = "x1" ]; then
+ echo "\n\n** Error: Failed to install prerequisites **\n\n"; (exit 1);
else
- echo "\n\n** Error: Failed to install prerequisites **\n\n"; export _commandExitCode=1;
+ $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)";
fi
$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument) --partition-count $(PartitionCount) --partition-index %(HelixWorkItem.Index)"
$(DotnetExe) run -f $(PERFLAB_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults);$(FinalCommand)
@@ -148,10 +148,10 @@
$(WorkItemDirectory)
$(WorkItemCommand) --bdn-artifacts $(BaselineArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(BaselineCoreRunArgument)"
- if [ "x$PERF_PREREQS_INSTALLED" = "x1" ]; then
- $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)";
+ if [ "x$PERF_PREREQS_INSTALL_FAILED" = "x1" ]; then
+ echo "\n\n** Error: Failed to install prerequisites **\n\n"; (exit 1);
else
- echo "\n\n** Error: Failed to install prerequisites **\n\n"; export _commandExitCode=1;
+ $(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)";
fi
$(WorkItemCommand) --bdn-artifacts $(ArtifactsDirectory) --bdn-arguments="--anyCategories $(BDNCategories) $(ExtraBenchmarkDotNetArguments) $(CoreRunArgument)"
$(DotnetExe) run -f $(PERFLAB_Framework) -p $(ResultsComparer) --base $(BaselineArtifactsDirectory) --diff $(ArtifactsDirectory) --threshold 2$(Percent) --xml $(XMLResults)