Merge pull request #23136 from spxtr/slow-1-1

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-03-22 16:00:01 -07:00
commit b04f27c3be
2 changed files with 5 additions and 1 deletions

View File

@ -391,6 +391,7 @@
- 'gke-1.1':
timeout: 150
description: 'Run E2E tests on GKE from the current release branch.'
cron-string: 'H */6 * * *'
- 'gke-prod':
timeout: 180
description: |
@ -412,6 +413,7 @@
branch: 'release-1.1'
runner: '{old-runner-1-1}'
post-env: ''
cron-string: 'H */6 * * *'
suffix:
- 'gce-release-1.1':
timeout: 175
@ -429,6 +431,7 @@
branch: 'release-1.0'
runner: '{old-runner-1-0}'
post-env: ''
cron-string: 'H */12 * * *'
suffix:
- 'gce-release-1.0':
timeout: 150

View File

@ -57,7 +57,7 @@
- junit-publisher
- log-parser
triggers:
- timed: 'H/30 * * * *'
- timed: '{cron-string}'
wrappers:
- ansicolor:
colormap: xterm
@ -145,6 +145,7 @@
post-env: ''
soak-deploy: ''
soak-continuous: ''
cron-string: 'H */6 * * *'
- 'gke':
deploy-description: |
Deploy Kubernetes to a GKE soak cluster using the staging GKE