Merge pull request #24277 from ihmccreery/upgrade-timeout

hack/jenkins/job-configs/global.yaml

@@ -140,7 +140,11 @@
     runner: bash <(curl -fsS --retry 3  "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh")
     dockerized-runner: bash <(curl -fsS --retry 3  "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/dockerized-e2e-runner.sh")
     old-runner-1-1: bash <(curl -fsS --retry 3  "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e.sh")
+    # XXX This is a hack to run only the tests we care about, without importing all of the skip list vars from the v1.1 e2e.sh.
+    default-skip-list-1-1: Autoscaling\sSuite|resource\susage\stracking|Nodes|Etcd\sFailure|MasterCerts|experimental\sresource\susage\stracking|ServiceLoadBalancer|Shell|Daemon\sset|Deployment|Skipped|Restart\sshould\srestart\sall\snodes|Example|Reboot|ServiceLoadBalancer|DaemonRestart\sController\sManager|Daemon\sset\sshould\srun\sand\sstop\scomplex\sdaemon|Resource\susage\sof\ssystem\scontainers|allows\sscheduling\sof\spods\son\sa\sminion\safter\sit\srejoins\sthe\scluster
     old-runner-1-0: bash <(curl -fsS --retry 3  "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.0/hack/jenkins/e2e.sh")
+    # XXX This is a hack to run only the tests we care about, without importing all of the skip list vars from the v1.0 e2e.sh.
+    default-skip-list-1-0: Skipped|Restart\sshould\srestart\sall\snodes|Example|Reboot|ServiceLoadBalancer|DaemonRestart\sController\sManager|Daemon\sset\sshould\srun\sand\sstop\scomplex\sdaemon|Resource\susage\sof\ssystem\scontainers|allows\sscheduling\sof\spods\son\sa\sminion\safter\sit\srejoins\sthe\scluster
     provider-env: ''
     gce-provider-env: |
         export KUBERNETES_PROVIDER="gce"

hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml

@@ -908,7 +908,7 @@
     suffix:
         - 'gke-1.1-1.2-kubectl-skew':
             description: 'Deploys a cluster at v1.1 and runs the v1.2 Kubectl tests.'
-            timeout: 30
+            timeout: 120
             job-env: |
                 export PROJECT="kube-jks-gke-upg-experimental"
                 export E2E_NAME="gke-1-1-1-2-ctl-skew"
@@ -919,7 +919,7 @@
                 export E2E_OPT="--check_version_skew=false"
         - 'gke-1.1-1.2-upgrade-master':
             description: 'Deploys a cluster at v1.1, upgrades its master to v1.2, and runs v1.1 tests against it.'
-            timeout: 30
+            timeout: 300
             job-env: |
                 export PROJECT="kube-jks-gke-upg-experimental"
                 export E2E_NAME="gke-1-1-1-2-upg-mas"
@@ -929,9 +929,10 @@
                 export GINKGO_UPGRADE_TEST_ARGS="--ginkgo.focus=\[Feature:MasterUpgrade\] --upgrade-target=ci/latest-1.2"
                 export JENKINS_USE_OLD_TESTS="true"
                 export E2E_OPT="--check_version_skew=false"
+                export GINKGO_TEST_ARGS="--ginkgo.skip={default-skip-list-1-1}"
         - 'gke-1.1-1.2-upgrade-cluster':
             description: 'Deploys a cluster at v1.1, upgrades the cluster to v1.2, and runs v1.1 tests against it.'
-            timeout: 30
+            timeout: 300
             job-env: |
                 export PROJECT="kube-jks-gke-upg-experimental"
                 export E2E_NAME="gke-1-1-1-2-upg-clu"
@@ -941,9 +942,10 @@
                 export GINKGO_UPGRADE_TEST_ARGS="--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest-1.2"
                 export JENKINS_USE_OLD_TESTS="true"
                 export E2E_OPT="--check_version_skew=false"
+                export GINKGO_TEST_ARGS="--ginkgo.skip={default-skip-list-1-1}"
         - '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: 30
+            timeout: 300
             job-env: |
                 export PROJECT="kube-jks-gke-upg-experimental"
                 export E2E_NAME="gke-1-1-1-2-upg-clu-new"