Merge pull request #20359 from ihmccreery/timeouts

Knock down the timeouts for gce, gce-slow, gke, and gke-slow
pull/6/head
Jeff Lowdermilk 2016-02-02 09:20:16 -08:00
commit 449e708aa5
1 changed files with 6 additions and 6 deletions

View File

@ -38,7 +38,10 @@
suffix: suffix:
- 'gce': - 'gce':
description: 'Run E2E tests on GCE using the latest successful build.' description: 'Run E2E tests on GCE using the latest successful build.'
timeout: 150 timeout: 30
- 'gce-slow':
description: 'Run slow E2E tests on GCE using the latest successful build.'
timeout: 60
- 'gce-autoscaling': - 'gce-autoscaling':
description: 'Run autoscaling E2E tests on GCE using the latest successful build.' description: 'Run autoscaling E2E tests on GCE using the latest successful build.'
timeout: 210 timeout: 210
@ -51,9 +54,6 @@
- 'gce-scalability': - 'gce-scalability':
description: 'Run scalability E2E tests on GCE using the latest successful build.' description: 'Run scalability E2E tests on GCE using the latest successful build.'
timeout: 210 timeout: 210
- 'gce-slow':
description: 'Run slow E2E tests on GCE using the latest successful build.'
timeout: 270
- 'gce-flannel': - 'gce-flannel':
description: 'Run E2E tests on GCE using Flannel and the latest successful build. This suite is quarantined in a dedicated project because Flannel integration is experimental.' description: 'Run E2E tests on GCE using Flannel and the latest successful build. This suite is quarantined in a dedicated project because Flannel integration is experimental.'
timeout: 90 timeout: 90
@ -72,10 +72,10 @@
suffix: suffix:
- 'gke': - 'gke':
description: Runs all non-slow, non-serial, non-flaky, tests on GKE in parallel (against GKE test endpoint) description: Runs all non-slow, non-serial, non-flaky, tests on GKE in parallel (against GKE test endpoint)
timeout: 300 timeout: 30
- 'gke-slow': - 'gke-slow':
description: 'Run slow E2E tests on GKE using the latest successful build.' description: 'Run slow E2E tests on GKE using the latest successful build.'
timeout: 300 timeout: 60
- 'gke-flaky': - 'gke-flaky':
description: | description: |
Run flaky e2e tests using the following config:<br> Run flaky e2e tests using the following config:<br>