diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-09-22 15:24:44 -0700 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-09-22 15:24:44 -0700 |
| commit | f7d8860f4ff688e966159f31e2c281a22e2aa3f4 (patch) | |
| tree | 9367583b04c0e9464c6f091d699dfc64ba63a7f8 /tools/internal_ci/macos/pull_request | |
| parent | 76e0c1ddd536342bdc5059209da38d5406c7e717 (diff) | |
| parent | 31c66c576ad00504b34182340f8ff21bc3f447fb (diff) | |
Merge remote-tracking branch 'upstream/master' into fix-stream-compression-eos
Diffstat (limited to 'tools/internal_ci/macos/pull_request')
| -rw-r--r-- | tools/internal_ci/macos/pull_request/grpc_basictests_dbg.cfg | 2 | ||||
| -rw-r--r-- | tools/internal_ci/macos/pull_request/grpc_basictests_opt.cfg | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_dbg.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_dbg.cfg index f058f0c7e4..30c01d3e2f 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_dbg.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_dbg.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos dbg --internal_ci -j 1 --inner_jobs 4" + value: "-f basictests macos dbg --internal_ci -j 1 --inner_jobs 4 --max_time=3600" } diff --git a/tools/internal_ci/macos/pull_request/grpc_basictests_opt.cfg b/tools/internal_ci/macos/pull_request/grpc_basictests_opt.cfg index 5048baaf48..b63ee713bc 100644 --- a/tools/internal_ci/macos/pull_request/grpc_basictests_opt.cfg +++ b/tools/internal_ci/macos/pull_request/grpc_basictests_opt.cfg @@ -27,5 +27,5 @@ action { env_vars { key: "RUN_TESTS_FLAGS" - value: "-f basictests macos opt --internal_ci -j 1 --inner_jobs 4" + value: "-f basictests macos opt --internal_ci -j 1 --inner_jobs 4 --max_time=3600" } |