diff options
| author |  David Garcia Quintas <dgq@google.com> | 2017-12-06 16:16:49 -0800 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2017-12-06 16:16:49 -0800 |
| commit | d1966582797e0547de0f81e032b4bc5617030c79 (patch) | |
| tree | d60ed7e87bbfb7d0aaa2cee7687e85155e17bf31 /tools/internal_ci/linux/grpc_interop_matrix.cfg | |
| parent | 8c5c654fa32c3f139babb6a5180c01028e19b631 (diff) | |
| parent | 95e23594b026eca21151f31b039bd2a51ea67109 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into removed_expiration_interval
Diffstat (limited to 'tools/internal_ci/linux/grpc_interop_matrix.cfg')
| -rw-r--r-- | tools/internal_ci/linux/grpc_interop_matrix.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/internal_ci/linux/grpc_interop_matrix.cfg b/tools/internal_ci/linux/grpc_interop_matrix.cfg index a7fd479a73..71e930e0b0 100644 --- a/tools/internal_ci/linux/grpc_interop_matrix.cfg +++ b/tools/internal_ci/linux/grpc_interop_matrix.cfg @@ -17,7 +17,7 @@ # Location of the continuous shell script in repository. build_file: "grpc/tools/internal_ci/linux/grpc_interop_matrix.sh" # grpc_interop tests can take 1 hours to complete. -timeout_mins: 60 +timeout_mins: 120 action { define_artifacts { regex: "**/sponge_log.xml" |