From aafa6994296430795ddb0e8b1eaf1fe7c7037a28 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Wed, 6 Sep 2017 17:20:15 +0200
Subject: [PATCH 1/2] prevent timeout for node and python windows artifact
 builds

---
 tools/internal_ci/windows/grpc_build_artifacts.bat | 2 +-
 tools/run_tests/artifacts/artifact_targets.py      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/internal_ci/windows/grpc_build_artifacts.bat b/tools/internal_ci/windows/grpc_build_artifacts.bat
index 29c876dd353..17d9571d43e 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/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py
index bd186263ca6..12263282ae0 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':

From 3ce4b28b0f8df1ee70f0b961ca8c15561245966c Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Wed, 6 Sep 2017 17:23:17 +0200
Subject: [PATCH 2/2] no need for ruby workaround

---
 tools/jenkins/build_artifacts.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/jenkins/build_artifacts.sh b/tools/jenkins/build_artifacts.sh
index 166c5104ccc..ed2c86adbd0 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