github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use timeout command instead of Jenkins for e2e tests.

Browse Source
This commit is contained in:
Joe Finney 2016-03-02 14:38:50 -08:00
parent ec77d0841d
commit 5315921d68
8 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,6 +127,10 @@
name: global
emails: '$DEFAULT_RECIPIENTS'
cron-string: 'H/30 * * * *'
# How long to wait after sending TERM to send KILL (minutes)
kill-timeout: 15
# Just to be safe, use the Jenkins timeout after a long time.
jenkins-timeout: 600
branch: 'master'
job-env: ''
runner: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh" | bash -

6
hack/jenkins/job-configs/kubernetes-build.yaml
View File

@ -6,7 +6,7 @@
numToKeep: 200
builders:
- shell: 'bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-started.sh")'
- shell: './hack/jenkins/build.sh'
- shell: 'timeout -k {kill-timeout}m 30m ./hack/jenkins/build.sh'
properties:
- mail-watcher
publishers:
@ -35,8 +35,8 @@
cron: 'H/2 * * * *'
wrappers:
- timeout:
timeout: 30
abort: true
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- project:

4
hack/jenkins/job-configs/kubernetes-e2e-gce-enormous-startup.yaml
View File

@ -30,7 +30,7 @@
export TEST_CLUSTER_RESYNC_PERIOD="--min-resync-period=12h"
{post-env}
export KUBE_GCE_NETWORK="e2e-enormous-cluster"
{runner}
timeout -k {kill-timeout}m 480m {runner}
properties:
- mail-watcher
publishers:
@ -45,7 +45,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: 480
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- workspace-cleanup

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

@ -21,14 +21,14 @@
{provider-env}
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m {timeout}m {runner}
properties:
- mail-watcher
wrappers:
- ansicolor:
colormap: xterm
- timeout:
timeout: '{timeout}'
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- workspace-cleanup

4
hack/jenkins/job-configs/kubernetes-kubemark.yaml
View File

@ -8,7 +8,7 @@
{provider-env}
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m {timeout}m {runner}
properties:
- mail-watcher
publishers:
@ -27,7 +27,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: '{timeout}'
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- workspace-cleanup

8
hack/jenkins/job-configs/kubernetes-soak.yaml
View File

@ -9,7 +9,7 @@
{soak-deploy}
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m 90m {runner}
properties:
- build-blocker:
use-build-blocker: true
@ -24,7 +24,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: 90
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- workspace-cleanup
@ -41,7 +41,7 @@
{soak-continuous}
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m 360m {runner}
properties:
- build-blocker:
use-build-blocker: true
@ -60,7 +60,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: 360
timeout: '{jenkins-timeout}'
fail: true
- timestamps

4
hack/jenkins/job-configs/kubernetes-test-go.yaml
View File

@ -8,7 +8,7 @@
node: unittest
builders:
- shell: 'bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-started.sh")'
- shell: './hack/jenkins/gotest-dockerized.sh'
- shell: 'timeout -k {kill-timeout}m {timeout}m ./hack/jenkins/gotest-dockerized.sh'
publishers:
- claim-build
- gcs-uploader
@ -47,7 +47,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: '{timeout}'
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- raw:

9
hack/jenkins/job-configs/kubernetes-upgrades.yaml
View File

@ -70,7 +70,7 @@
# per-step variables, such as whether to run tests
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m 60m {runner}
properties:
- mail-watcher
publishers:
@ -84,7 +84,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: 60
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- workspace-cleanup
@ -105,7 +105,7 @@
# per-step variables, such as whether to run tests
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m 300m {runner}
properties:
- mail-watcher
publishers:
@ -119,8 +119,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: 300
abort: true
timeout: '{jenkins-timeout}'
fail: true
- timestamps
# Don't clean the workspace; we want to keep configs intact across steps in the multijob