Merge pull request #24477 from ihmccreery/bump-timeout

Automatic merge from submit-queue Bump upgrade test timout to 10 hours @spxtr is it reasonable to expect that running the v1.2 tests in serial would take longer than ~ 5 hours (assuming the upgrade beforehand takes < 1 hour)?

Merge pull request #24477 from ihmccreery/bump-timeout
c9c2a252 · k8s-merge-robot · 4638f2f3 · 59dfea62 · c9c2a252
Commit c9c2a252 authored Apr 19, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

kubernetes-e2e.yaml ...enkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml +1 -1

No files found.
--- a/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml
+++ b/hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml
@@ -975,7 +975,7 @@
                export MINION_SIZE='n1-standard-2'
        - 'gke-1.1-1.2-upgrade-cluster-new':
            description: 'Deploys a cluster at v1.1, upgrades the cluster to v1.2, and runs v1.2 tests against it.'
-            timeout: 300
+            timeout: 600
            job-env: |
                export PROJECT="kube-jks-gke-upg-experimental"
                export E2E_NAME="gke-1-1-1-2-upg-clu-new"