Print out a message if e2e times out.

This commit is contained in:
Joe Finney 2016-03-03 13:23:40 -08:00
parent 56b7c9ba20
commit 36917ccf47
8 changed files with 30 additions and 10 deletions

View File

@ -131,6 +131,15 @@
kill-timeout: 15 kill-timeout: 15
# Just to be safe, use the Jenkins timeout after a long time. # Just to be safe, use the Jenkins timeout after a long time.
jenkins-timeout: 600 jenkins-timeout: 600
# report-rc assumes that $rc is set to the exit status of the runner.
report-rc: |
if [[ ${{rc}} -eq 124 || ${{rc}} -eq 137 ]]; then
echo "Build timed out" >&2
elif [[ ${{rc}} -ne 0 ]]; then
echo "Build failed" >&2
fi
echo "Exiting with code: ${{rc}}"
exit ${{rc}}
branch: 'master' branch: 'master'
job-env: '' job-env: ''
runner: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh" | bash - runner: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh" | bash -

View File

@ -6,7 +6,9 @@
numToKeep: 200 numToKeep: 200
builders: builders:
- shell: 'bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-started.sh")' - shell: 'bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-started.sh")'
- shell: 'timeout -k {kill-timeout}m 30m ./hack/jenkins/build.sh' - shell: |
timeout -k {kill-timeout}m 30m ./hack/jenkins/build.sh && rc=$? || rc=$?
{report-rc}
properties: properties:
- mail-watcher - mail-watcher
publishers: publishers:

View File

@ -30,7 +30,8 @@
export TEST_CLUSTER_RESYNC_PERIOD="--min-resync-period=12h" export TEST_CLUSTER_RESYNC_PERIOD="--min-resync-period=12h"
{post-env} {post-env}
export KUBE_GCE_NETWORK="e2e-enormous-cluster" export KUBE_GCE_NETWORK="e2e-enormous-cluster"
timeout -k {kill-timeout}m 480m {runner} timeout -k {kill-timeout}m 480m {runner} && rc=$? || rc=$?
{report-rc}
properties: properties:
- mail-watcher - mail-watcher
publishers: publishers:

View File

@ -21,13 +21,14 @@
{provider-env} {provider-env}
{job-env} {job-env}
{post-env} {post-env}
if ! timeout -k {kill-timeout}m {timeout}m {runner}; then timeout -k {kill-timeout}m {timeout}m {runner} && rc=$? || rc=$?
if [[ ${{rc}} -ne 0 ]]; then
if [[ -x kubernetes/cluster/log-dump.sh && -d _artifacts ]]; then if [[ -x kubernetes/cluster/log-dump.sh && -d _artifacts ]]; then
echo "Dumping logs for any remaining nodes" echo "Dumping logs for any remaining nodes"
./kubernetes/cluster/log-dump.sh _artifacts ./kubernetes/cluster/log-dump.sh _artifacts
fi fi
exit 1
fi fi
{report-rc}
properties: properties:
- mail-watcher - mail-watcher
wrappers: wrappers:

View File

@ -8,7 +8,8 @@
{provider-env} {provider-env}
{job-env} {job-env}
{post-env} {post-env}
timeout -k {kill-timeout}m {timeout}m {runner} timeout -k {kill-timeout}m {timeout}m {runner} && rc=$? || rc=$?
{report-rc}
properties: properties:
- mail-watcher - mail-watcher
publishers: publishers:

View File

@ -9,7 +9,8 @@
{soak-deploy} {soak-deploy}
{job-env} {job-env}
{post-env} {post-env}
timeout -k {kill-timeout}m 90m {runner} timeout -k {kill-timeout}m 90m {runner} && rc=$? || rc=$?
{report-rc}
properties: properties:
- build-blocker: - build-blocker:
use-build-blocker: true use-build-blocker: true
@ -41,7 +42,8 @@
{soak-continuous} {soak-continuous}
{job-env} {job-env}
{post-env} {post-env}
timeout -k {kill-timeout}m 360m {runner} timeout -k {kill-timeout}m 360m {runner} && rc=$? || rc=$?
{report-rc}
properties: properties:
- build-blocker: - build-blocker:
use-build-blocker: true use-build-blocker: true

View File

@ -8,7 +8,9 @@
node: unittest node: unittest
builders: builders:
- shell: 'bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-started.sh")' - shell: 'bash <(curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/upload-started.sh")'
- shell: 'timeout -k {kill-timeout}m {timeout}m ./hack/jenkins/gotest-dockerized.sh' - shell: |
timeout -k {kill-timeout}m {timeout}m ./hack/jenkins/gotest-dockerized.sh && rc=$? || rc=$?
{report-rc}
publishers: publishers:
- claim-build - claim-build
- gcs-uploader - gcs-uploader

View File

@ -70,7 +70,8 @@
# per-step variables, such as whether to run tests # per-step variables, such as whether to run tests
{job-env} {job-env}
{post-env} {post-env}
timeout -k {kill-timeout}m 60m {runner} timeout -k {kill-timeout}m 60m {runner} && rc=$? || rc=$?
{report-rc}
properties: properties:
- mail-watcher - mail-watcher
publishers: publishers:
@ -105,7 +106,8 @@
# per-step variables, such as whether to run tests # per-step variables, such as whether to run tests
{job-env} {job-env}
{post-env} {post-env}
timeout -k {kill-timeout}m 300m {runner} timeout -k {kill-timeout}m 300m {runner} && rc=$? || rc=$?
{report-rc}
properties: properties:
- mail-watcher - mail-watcher
publishers: publishers: