Repository: beam Updated Branches: refs/heads/master b79dd6428 -> f13a84d67
Bump Dataflow ROS timeout to 120 minutes Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/f1179137 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/f1179137 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/f1179137 Branch: refs/heads/master Commit: f1179137bdb9e3df68ea9963b6d5b6759cb49f36 Parents: 37c17f2 Author: Kenneth Knowles <[email protected]> Authored: Wed Mar 8 10:47:07 2017 -0800 Committer: Kenneth Knowles <[email protected]> Committed: Wed Mar 8 14:24:13 2017 -0800 ---------------------------------------------------------------------- .jenkins/common_job_properties.groovy | 5 +++-- .../job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/f1179137/.jenkins/common_job_properties.groovy ---------------------------------------------------------------------- diff --git a/.jenkins/common_job_properties.groovy b/.jenkins/common_job_properties.groovy index bcac19e..4506636 100644 --- a/.jenkins/common_job_properties.groovy +++ b/.jenkins/common_job_properties.groovy @@ -29,8 +29,9 @@ class common_job_properties { // Sets common top-level job properties for main repository jobs. static void setTopLevelMainJobProperties(context, - String defaultBranch = 'master') { - setTopLevelJobProperties(context, 'beam', defaultBranch, 100) + String defaultBranch = 'master', + int defaultTimeout = 100) { + setTopLevelJobProperties(context, 'beam', defaultBranch, defaultTimeout) } // Sets common top-level job properties. Accessed through one of the above http://git-wip-us.apache.org/repos/asf/beam/blob/f1179137/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy ---------------------------------------------------------------------- diff --git a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy index a3b8150..77c4864 100644 --- a/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy +++ b/.jenkins/job_beam_PostCommit_Java_RunnableOnService_Dataflow.groovy @@ -26,7 +26,7 @@ mavenJob('beam_PostCommit_Java_RunnableOnService_Dataflow') { previousNames('beam_PostCommit_RunnableOnService_GoogleCloudDataflow') // Set common parameters. - common_job_properties.setTopLevelMainJobProperties(delegate) + common_job_properties.setTopLevelMainJobProperties(delegate, 'master', 120) // Set maven parameters. common_job_properties.setMavenConfig(delegate)
