Skip to content

Commit f03de39

Browse files
authored
Fixing official SDK performance runs (dotnet#2696)
* Addressing the 103 exitcode [inability to find the Python exe] on official performance machines.
1 parent b3ad977 commit f03de39

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

build/uploadperftobenchview.cmd

+10-7
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ if not exist %perfWorkingDirectory%\nul (
3333
exit 1)
3434

3535

36+
set pythonCmd=py
37+
if exist "C:\Python35\python.exe" set pythonCmd=C:\Python35\python.exe
38+
3639
powershell -NoProfile -NoLogo wget https://dist.nuget.org/win-x86-commandline/latest/nuget.exe -OutFile "%perfWorkingDirectory%\nuget.exe"
3740

3841
if exist "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat" rmdir /s /q "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat"
@@ -49,24 +52,24 @@ if /I "%runType%" == "rolling" (set benchViewName=%benchViewName% %GIT_COMMIT%)
4952
echo BenchViewName: "%benchViewName%"
5053

5154
echo Creating: "%perfWorkingDirectory%\submission-metadata.json"
52-
py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\submission-metadata.py" --name "%benchViewName%" --user-email "[email protected]" -o "%perfWorkingDirectory%\submission-metadata.json"
55+
%pythonCmd% "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\submission-metadata.py" --name "%benchViewName%" --user-email "[email protected]" -o "%perfWorkingDirectory%\submission-metadata.json"
5356

5457
echo Creating: "%perfWorkingDirectory%\build.json"
55-
py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\build.py" git --branch %GIT_BRANCH_WITHOUT_ORIGIN% --type "%runType%" --source-timestamp "%timeStamp%" -o "%perfWorkingDirectory%\build.json"
58+
%pythonCmd% "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\build.py" git --branch %GIT_BRANCH_WITHOUT_ORIGIN% --type "%runType%" --source-timestamp "%timeStamp%" -o "%perfWorkingDirectory%\build.json"
5659

5760
echo Creating: "%perfWorkingDirectory%\machinedata.json"
58-
py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\machinedata.py" -o "%perfWorkingDirectory%\machinedata.json"
61+
%pythonCmd% "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\machinedata.py" -o "%perfWorkingDirectory%\machinedata.json"
5962

6063
echo Creating: "%perfWorkingDirectory%\measurement.json"
6164
pushd "%perfWorkingDirectory%"
6265
for /f "tokens=*" %%a in ('dir /b/a-d *.xml') do (
6366
echo Processing: "%%a"
64-
py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\measurement.py" xunitscenario "%%a" --better desc --drop-first-value --append -o "%perfWorkingDirectory%\measurement.json"
67+
%pythonCmd% "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\measurement.py" xunitscenario "%%a" --better desc --drop-first-value --append -o "%perfWorkingDirectory%\measurement.json"
6568
)
6669
popd
6770

68-
echo Creating: "${perfWorkingDirectory}\submission.json"
69-
py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\submission.py" "%perfWorkingDirectory%\measurement.json" ^
71+
echo Creating: "%perfWorkingDirectory%\submission.json"
72+
%pythonCmd% "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\submission.py" "%perfWorkingDirectory%\measurement.json" ^
7073
--build "%perfWorkingDirectory%\build.json" ^
7174
--machine-data "%perfWorkingDirectory%\machinedata.json" ^
7275
--metadata "%perfWorkingDirectory%\submission-metadata.json" ^
@@ -80,6 +83,6 @@ py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\submission.py" "
8083
-o "%perfWorkingDirectory%\submission.json"
8184

8285
echo Uploading: "%perfWorkingDirectory%\submission.json"
83-
py "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\upload.py" "%perfWorkingDirectory%\submission.json" --container coreclr
86+
%pythonCmd% "%perfWorkingDirectory%\Microsoft.BenchView.JSONFormat\tools\upload.py" "%perfWorkingDirectory%\submission.json" --container coreclr
8487

8588
exit /b %ErrorLevel%

0 commit comments

Comments
 (0)