Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kill build processes before perf run ALSO fail build if we can't kill build processes #15120

Merged
merged 8 commits into from
Nov 18, 2016
Merged

kill build processes before perf run ALSO fail build if we can't kill build processes #15120

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f332c0
kill build processes before perf run
TyOverby Nov 9, 2016
c0fcdc1
only ignore success when killing processes
TyOverby Nov 9, 2016
35f45c1
Check for error level exactly-equal-to 1
TyOverby Nov 10, 2016
6b84bcc
change strategy
TyOverby Nov 11, 2016
a0bdad7
Merge branch 'kill-build' of github.com:TyOverby/roslyn into kill-build
TyOverby Nov 11, 2016
36fd700
remove killing csc and vbc
TyOverby Nov 11, 2016
488d365
add perf proc-kill message
TyOverby Nov 11, 2016
7f24817
change perf proc-kill message
TyOverby Nov 11, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions cibuild.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ copy "build\bootstrap\*" "%bindir%\Bootstrap" || goto :BuildFailed
REM Clean the previous build
msbuild %MSBuildAdditionalCommandLineArgs% /t:Clean build/Toolset/Toolset.csproj /p:Configuration=%BuildConfiguration% /fileloggerparameters:LogFile="%bindir%\BootstrapClean.log" || goto :BuildFailed

call :TerminateBuildProcesses
call :TerminateBuildProcesses || goto :BuildFailed

if defined TestDeterminism (
powershell -noprofile -executionPolicy RemoteSigned -file "%RoslynRoot%\build\scripts\test-determinism.ps1" "%bindir%\Bootstrap" || goto :BuildFailed
call :TerminateBuildProcesses
call :TerminateBuildProcesses || goto :BuildFailed
exit /b 0
)

Expand Down Expand Up @@ -105,14 +105,16 @@ if defined TestPerfRun (
)
)

call :TerminateBuildProcesses || goto :BuildFailed

.\Binaries\%BuildConfiguration%\Exes\Perf.Runner\Roslyn.Test.Performance.Runner.exe --no-trace-upload !EXTRA_PERF_RUNNER_ARGS! || goto :BuildFailed
exit /b 0
)

msbuild %MSBuildAdditionalCommandLineArgs% /p:BootstrapBuildPath="%bindir%\Bootstrap" BuildAndTest.proj /p:Configuration=%BuildConfiguration% /p:Test64=%Test64% /p:TestVsi=%TestVsi% /p:RunProcessWatchdog=%RunProcessWatchdog% /p:BuildStartTime=%BuildStartTime% /p:"ProcDumpExe=%ProcDumpExe%" /p:BuildTimeLimit=%BuildTimeLimit% /p:PathMap="%RoslynRoot%=q:\roslyn" /p:Feature=pdb-path-determinism /fileloggerparameters:LogFile="%bindir%\Build.log";verbosity=diagnostic /p:DeployExtension=false || goto :BuildFailed
powershell -noprofile -executionPolicy RemoteSigned -file "%RoslynRoot%\build\scripts\check-msbuild.ps1" "%bindir%\Build.log" || goto :BuildFailed

call :TerminateBuildProcesses
call :TerminateBuildProcesses || goto :BuildFailed

REM Verify the state of our project.jsons
echo Running RepoUtil
Expand Down Expand Up @@ -145,5 +147,12 @@ exit /b 1
@REM Kill any instances of msbuild.exe to ensure that we never reuse nodes (e.g. if a non-roslyn CI run
@REM left some floating around).

taskkill /F /IM vbcscompiler.exe 2> nul
taskkill /F /IM msbuild.exe 2> nul
@REM An error-level of 1 means that the process was found, but could not be killed.
echo Killing all build-related processes
taskkill /F /IM msbuild.exe > nul
if %ERRORLEVEL% == 1 exit /b 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should add a message explaining why this terminated. Otherwise the log file will be hard to process in this case .

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a message "killing all build related processes"

I think this is generic enough, because we can call this TerminateBuildProcesses function on both a failure-path or just the normal "time to do a perf run" path.


taskkill /F /IM vbcscompiler.exe > nul
if %ERRORLEVEL% == 1 exit /b 1

exit /b 0