Merge pull request #12412 from jtattermusch/avoid_win_artifact_timeout

Avoid win artifact timeout
pull/12467/head
Jan Tattermusch 7 years ago committed by GitHub
commit 04e504f185
  1. 2
      tools/internal_ci/windows/grpc_build_artifacts.bat
  2. 4
      tools/jenkins/build_artifacts.sh
  3. 2
      tools/run_tests/artifacts/artifact_targets.py

@ -26,7 +26,7 @@ cd /d %~dp0\..\..\..
call tools/internal_ci/helper_scripts/prepare_build_windows.bat
python tools/run_tests/task_runner.py -f artifact windows || goto :error
python tools/run_tests/task_runner.py -f artifact windows -j 4 || goto :error
goto :EOF
:error

@ -24,8 +24,4 @@ set -ex -o igncr || set -ex
curr_platform="$platform"
unset platform # variable named 'platform' breaks the windows build
if [ "$curr_platform" == "linux" ] && [ "$language" == "ruby" ] ; then
./tools/run_tests/artifacts/build_artifact_ruby.sh
else
python tools/run_tests/task_runner.py -f artifact $language $curr_platform $architecture
fi

@ -150,6 +150,7 @@ class PythonArtifact:
self.py_version,
'32' if self.arch == 'x86' else '64'],
environ=environ,
timeout_seconds=45*60,
use_workspace=True)
else:
environ['PYTHON'] = self.py_version
@ -257,6 +258,7 @@ class NodeExtArtifact:
['tools\\run_tests\\artifacts\\build_artifact_node.bat',
self.gyp_arch],
use_workspace=True,
timeout_seconds=45*60,
cpu_cost=cpu_cost)
else:
if self.platform == 'linux':

Loading…
Cancel
Save