Merge pull request #24294 from spxtr/build-boop

Bump kubernetes-build timeout.
This commit is contained in:
Daniel Smith 2016-04-14 16:23:11 -07:00
commit d8532e0746

View File

@ -7,7 +7,7 @@
builders: builders:
- shell: 'JENKINS_BUILD_STARTED=true bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh")' - shell: 'JENKINS_BUILD_STARTED=true bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-to-gcs.sh")'
- shell: | - shell: |
timeout -k {kill-timeout}m 30m ./hack/jenkins/build.sh && rc=$? || rc=$? timeout -k {kill-timeout}m {timeout}m ./hack/jenkins/build.sh && rc=$? || rc=$?
{report-rc} {report-rc}
properties: properties:
- mail-watcher - mail-watcher
@ -46,11 +46,15 @@
build: build:
- 'build': - 'build':
branch: 'master' branch: 'master'
timeout: 50
- 'build-1.0': - 'build-1.0':
branch: 'release-1.0' branch: 'release-1.0'
timeout: 30
- 'build-1.1': - 'build-1.1':
branch: 'release-1.1' branch: 'release-1.1'
timeout: 30
- 'build-1.2': - 'build-1.2':
branch: 'release-1.2' branch: 'release-1.2'
timeout: 30
jobs: jobs:
- 'kubernetes-{build}' - 'kubernetes-{build}'