bpo-36511: clean up python process before deploy on ARM Windows buildbots (GH-14431)
authorPaul Monson <paulmon@users.noreply.github.com>
Mon, 9 Sep 2019 21:11:17 +0000 (14:11 -0700)
committerZachary Ware <zachary.ware@gmail.com>
Mon, 9 Sep 2019 21:11:17 +0000 (22:11 +0100)
Tools/buildbot/remoteDeploy.bat

index 6b86e1e59b077d4b900d2d5c5662815a20ad427e..31f151921b3f73380ce6c37ea14614d72483ec38 100644 (file)
@@ -24,11 +24,18 @@ if NOT "%REMOTE_PYTHON_DIR:~-1,1%"=="\" (set REMOTE_PYTHON_DIR=%REMOTE_PYTHON_DI
 echo PYTHON_SOURCE = %PYTHON_SOURCE%
 echo REMOTE_PYTHON_DIR = %REMOTE_PYTHON_DIR%
 
+REM stop Python processes and remove existing files if found
+ssh %SSH_SERVER% "kill python.exe"
+ssh %SSH_SERVER% "kill python_d.exe"
 ssh %SSH_SERVER% "if EXIST %REMOTE_PYTHON_DIR% (rd %REMOTE_PYTHON_DIR% /s/q)"
+
+REM Create Python directories
 ssh %SSH_SERVER% "md %REMOTE_PYTHON_DIR%PCBuild\arm32"
 ssh %SSH_SERVER% "md %REMOTE_PYTHON_DIR%temp"
 ssh %SSH_SERVER% "md %REMOTE_PYTHON_DIR%Modules"
 ssh %SSH_SERVER% "md %REMOTE_PYTHON_DIR%PC"
+
+REM Copy Python files
 for /f "USEBACKQ" %%i in (`dir PCbuild\*.bat /b`) do @scp PCBuild\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild"
 for /f "USEBACKQ" %%i in (`dir PCbuild\*.py /b`) do @scp PCBuild\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild"
 for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.exe /b`) do @scp PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"