Merge pull request #15438 from jtattermusch/windows_faster_rsync

Speed up final rsync for windows kokoro builds
reviewable/pr15365/r2
Jan Tattermusch 7 years ago committed by GitHub
commit e418ceb9b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 27
      tools/internal_ci/helper_scripts/delete_nonartifacts.sh
  2. 9
      tools/internal_ci/windows/grpc_build_artifacts.bat
  3. 9
      tools/internal_ci/windows/grpc_build_packages.bat
  4. 9
      tools/internal_ci/windows/grpc_distribtests.bat
  5. 9
      tools/internal_ci/windows/grpc_distribtests_standalone.bat
  6. 3
      tools/internal_ci/windows/grpc_run_tests_matrix.bat

@ -0,0 +1,27 @@
#!/usr/bin/env bash
# Copyright 2018 The gRPC Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -ex
# change to grpc repo root
cd "$(dirname "$0")/../../.."
# After kokoro build finishes, the workspace gets rsync'ed to another machine,
# from where the artifacts and reports are processed.
# Especially on Windows, the rsync can take long time, so we cleanup the workspace
# after finishing each build. We only leave files we want to keep:
# - reports and artifacts
# - directory containing the kokoro scripts to prevent deleting a script while being executed.
time find . -type f -not -iname "*sponge_log.xml" -not -path "./reports/*" -not -path "./artifacts/*" -not -path "./tools/internal_ci/*" -exec rm -f {} +

@ -24,8 +24,9 @@ cd /d %~dp0\..\..\..
call tools/internal_ci/helper_scripts/prepare_build_windows.bat
python tools/run_tests/task_runner.py -f artifact windows -j 4 || goto :error
goto :EOF
python tools/run_tests/task_runner.py -f artifact windows -j 4
set RUNTESTS_EXITCODE=%errorlevel%
:error
exit /b %errorlevel%
bash tools/internal_ci/helper_scripts/delete_nonartifacts.sh
exit /b %RUNTESTS_EXITCODE%

@ -28,8 +28,9 @@ call tools/internal_ci/helper_scripts/prepare_build_windows.bat
powershell -Command "mv %KOKORO_GFILE_DIR%\github\grpc\artifacts input_artifacts"
dir input_artifacts
python tools/run_tests/task_runner.py -f package windows -j 4 || goto :error
goto :EOF
python tools/run_tests/task_runner.py -f package windows -j 4
set RUNTESTS_EXITCODE=%errorlevel%
:error
exit /b %errorlevel%
bash tools/internal_ci/helper_scripts/delete_nonartifacts.sh
exit /b %RUNTESTS_EXITCODE%

@ -28,8 +28,9 @@ call tools/internal_ci/helper_scripts/prepare_build_windows.bat
powershell -Command "mv %KOKORO_GFILE_DIR%\github\grpc\artifacts input_artifacts"
dir input_artifacts
python tools/run_tests/task_runner.py -f distribtest windows -j 4 || goto :error
goto :EOF
python tools/run_tests/task_runner.py -f distribtest windows -j 4
set RUNTESTS_EXITCODE=%errorlevel%
:error
exit /b %errorlevel%
bash tools/internal_ci/helper_scripts/delete_nonartifacts.sh
exit /b %RUNTESTS_EXITCODE%

@ -24,8 +24,9 @@ cd /d %~dp0\..\..\..
call tools/internal_ci/helper_scripts/prepare_build_windows.bat
python tools/run_tests/task_runner.py -f distribtest windows cpp -j 4 || goto :error
goto :EOF
python tools/run_tests/task_runner.py -f distribtest windows cpp -j 4
set RUNTESTS_EXITCODE=%errorlevel%
:error
exit /b %errorlevel%
bash tools/internal_ci/helper_scripts/delete_nonartifacts.sh
exit /b %RUNTESTS_EXITCODE%

@ -20,7 +20,6 @@ call tools/internal_ci/helper_scripts/prepare_build_windows.bat
python tools/run_tests/run_tests_matrix.py %RUN_TESTS_FLAGS%
set RUNTESTS_EXITCODE=%errorlevel%
@rem Reveal leftover processes that might be left behind by the build
tasklist /V
bash tools/internal_ci/helper_scripts/delete_nonartifacts.sh
exit /b %RUNTESTS_EXITCODE%

Loading…
Cancel
Save