diff options
author | Jan Tattermusch <jtattermusch@google.com> | 2016-12-05 13:01:38 +0100 |
---|---|---|
committer | Jan Tattermusch <jtattermusch@google.com> | 2016-12-05 13:01:38 +0100 |
commit | d4c33b9bfe2914ca220346861b15b96582e1262d (patch) | |
tree | 636e317e30d517086b67ca04aa032e862d4c9e84 /tools/internal_ci | |
parent | 2c1801ff94eae33999f78c29c77c704acb252bc8 (diff) |
increase master timeout
Diffstat (limited to 'tools/internal_ci')
-rw-r--r-- | tools/internal_ci/linux/grpc_master.cfg | 1 | ||||
-rwxr-xr-x | tools/internal_ci/linux/grpc_master.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/internal_ci/linux/grpc_master.cfg b/tools/internal_ci/linux/grpc_master.cfg index acaba608aa..3addb47bbd 100644 --- a/tools/internal_ci/linux/grpc_master.cfg +++ b/tools/internal_ci/linux/grpc_master.cfg @@ -32,3 +32,4 @@ # Location of the continuous shell script in repository. build_file: "grpc/tools/internal_ci/linux/grpc_master.sh" +timeout_mins: 60 diff --git a/tools/internal_ci/linux/grpc_master.sh b/tools/internal_ci/linux/grpc_master.sh index c706b1c746..6c7e2c2cd9 100755 --- a/tools/internal_ci/linux/grpc_master.sh +++ b/tools/internal_ci/linux/grpc_master.sh @@ -50,4 +50,4 @@ ps aux | grep port_server\\.py | awk '{print $2}' | xargs kill -9 if [ "$FAILED" != "" ] then exit 1 -fi
\ No newline at end of file +fi |