diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2017-09-09 23:15:17 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-09-09 23:15:17 +0200 |
| commit | 04e504f1858e0a600519a87d0d726ecd207c492c (patch) | |
| tree | 5ed871a4cd1c40fd7a299df24a28d9068816c80c | |
| parent | cc86cb75606ffc9d5a689b7adc3a5ee4fe8be7b7 (diff) | |
| parent | 3ce4b28b0f8df1ee70f0b961ca8c15561245966c (diff) | |
Merge pull request #12412 from jtattermusch/avoid_win_artifact_timeout
Avoid win artifact timeout
| -rw-r--r-- | tools/internal_ci/windows/grpc_build_artifacts.bat | 2 | ||||
| -rwxr-xr-x | tools/jenkins/build_artifacts.sh | 6 | ||||
| -rw-r--r-- | tools/run_tests/artifacts/artifact_targets.py | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/tools/internal_ci/windows/grpc_build_artifacts.bat b/tools/internal_ci/windows/grpc_build_artifacts.bat index 29c876dd35..17d9571d43 100644 --- a/tools/internal_ci/windows/grpc_build_artifacts.bat +++ b/tools/internal_ci/windows/grpc_build_artifacts.bat @@ -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 diff --git a/tools/jenkins/build_artifacts.sh b/tools/jenkins/build_artifacts.sh index 166c5104cc..ed2c86adbd 100755 --- a/tools/jenkins/build_artifacts.sh +++ b/tools/jenkins/build_artifacts.sh @@ -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 +python tools/run_tests/task_runner.py -f artifact $language $curr_platform $architecture diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index bd186263ca..12263282ae 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -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': |