aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/artifacts/artifact_targets.py
diff options
context:
space:
mode:
authorGravatar David Garcia Quintas <dgq@google.com>2017-09-18 11:55:52 -0700
committerGravatar David Garcia Quintas <dgq@google.com>2017-09-18 11:55:52 -0700
commitb352be025fcb117d2deca24ada9e90d94eba460c (patch)
tree7666446253d7cdbfa1b6c57a721329e32fef4a50 /tools/run_tests/artifacts/artifact_targets.py
parent63f31e8cd16b185fd735bd753afbc0375cd573aa (diff)
parenta5b571e22d8e3d06fbdecfc1a6e67a3036be536e (diff)
Upmerge from v1.6.x branch to master
Diffstat (limited to 'tools/run_tests/artifacts/artifact_targets.py')
-rw-r--r--tools/run_tests/artifacts/artifact_targets.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py
index 12263282ae..2cc0dfceab 100644
--- a/tools/run_tests/artifacts/artifact_targets.py
+++ b/tools/run_tests/artifacts/artifact_targets.py
@@ -158,6 +158,7 @@ class PythonArtifact:
return create_jobspec(self.name,
['tools/run_tests/artifacts/build_artifact_python.sh'],
environ=environ,
+ timeout_seconds=60*60,
use_workspace=True)
def __str__(self):