github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use a sane timeout for experimental upgrade jobs, and skip v1.1 tests properly

pull/6/head
Isaac Hollander McCreery 2016-04-14 13:04:05 -07:00
parent e9c1d59174
commit 5e1a268511
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hack/jenkins/job-configs/global.yaml
View File

@ -140,7 +140,11 @@
runner: bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh") 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") 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") 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") 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: '' provider-env: ''
gce-provider-env: | gce-provider-env: |
export KUBERNETES_PROVIDER="gce" export KUBERNETES_PROVIDER="gce"

10
hack/jenkins/job-configs/kubernetes-jenkins/kubernetes-e2e.yaml
View File

@ -887,7 +887,7 @@
suffix: suffix:
- 'gke-1.1-1.2-kubectl-skew': - 'gke-1.1-1.2-kubectl-skew':
description: 'Deploys a cluster at v1.1 and runs the v1.2 Kubectl tests.' description: 'Deploys a cluster at v1.1 and runs the v1.2 Kubectl tests.'
timeout: 30 timeout: 120
job-env: | job-env: |
export PROJECT="kube-jks-gke-upg-experimental" export PROJECT="kube-jks-gke-upg-experimental"
export E2E_NAME="gke-1-1-1-2-ctl-skew" export E2E_NAME="gke-1-1-1-2-ctl-skew"
@ -898,7 +898,7 @@
export E2E_OPT="--check_version_skew=false" export E2E_OPT="--check_version_skew=false"
- 'gke-1.1-1.2-upgrade-master': - '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.' 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: | job-env: |
export PROJECT="kube-jks-gke-upg-experimental" export PROJECT="kube-jks-gke-upg-experimental"
export E2E_NAME="gke-1-1-1-2-upg-mas" export E2E_NAME="gke-1-1-1-2-upg-mas"
@ -908,9 +908,10 @@
export GINKGO_UPGRADE_TEST_ARGS="--ginkgo.focus=\[Feature:MasterUpgrade\] --upgrade-target=ci/latest-1.2" export GINKGO_UPGRADE_TEST_ARGS="--ginkgo.focus=\[Feature:MasterUpgrade\] --upgrade-target=ci/latest-1.2"
export JENKINS_USE_OLD_TESTS="true" export JENKINS_USE_OLD_TESTS="true"
export E2E_OPT="--check_version_skew=false" 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': - '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.' 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: | job-env: |
export PROJECT="kube-jks-gke-upg-experimental" export PROJECT="kube-jks-gke-upg-experimental"
export E2E_NAME="gke-1-1-1-2-upg-clu" export E2E_NAME="gke-1-1-1-2-upg-clu"
@ -920,9 +921,10 @@
export GINKGO_UPGRADE_TEST_ARGS="--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest-1.2" export GINKGO_UPGRADE_TEST_ARGS="--ginkgo.focus=\[Feature:ClusterUpgrade\] --upgrade-target=ci/latest-1.2"
export JENKINS_USE_OLD_TESTS="true" export JENKINS_USE_OLD_TESTS="true"
export E2E_OPT="--check_version_skew=false" 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': - '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.' 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: | job-env: |
export PROJECT="kube-jks-gke-upg-experimental" export PROJECT="kube-jks-gke-upg-experimental"
export E2E_NAME="gke-1-1-1-2-upg-clu-new" export E2E_NAME="gke-1-1-1-2-upg-clu-new"