Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dump master/node logs at the end of E2E Jenkins jobs. #22374

Merged
merged 3 commits into from
Mar 3, 2016
Merged

Dump master/node logs at the end of E2E Jenkins jobs. #22374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5315921
Use timeout command instead of Jenkins for e2e tests.
spxtr Mar 2, 2016
56b7c9b
Dump logs at the end of e2e runs.
spxtr Mar 2, 2016
36917cc
Print out a message if e2e times out.
spxtr Mar 3, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 13 additions & 0 deletions hack/jenkins/job-configs/global.yaml
View file
Open in desktop
Expand Up @@ -127,6 +127,19 @@
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
# 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'
job-env: ''
runner: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/master/hack/jenkins/e2e-runner.sh" | bash -
Expand Down
8 changes: 5 additions & 3 deletions hack/jenkins/job-configs/kubernetes-build.yaml
View file
Open in desktop
Expand Up @@ -6,7 +6,9 @@
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 && rc=$? || rc=$?
{report-rc}
properties:
- mail-watcher
publishers:
Expand Down Expand Up @@ -35,8 +37,8 @@
cron: 'H/2 * * * *'
wrappers:
- timeout:
timeout: 30
abort: true
timeout: '{jenkins-timeout}'
fail: true
- timestamps

- project:
Expand Down
5 changes: 3 additions & 2 deletions hack/jenkins/job-configs/kubernetes-e2e-gce-enormous-startup.yaml
View file
Open in desktop
Expand Up @@ -30,7 +30,8 @@
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} && rc=$? || rc=$?
{report-rc}
properties:
- mail-watcher
publishers:
Expand All @@ -45,7 +46,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: 480
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- workspace-cleanup
Expand Down
11 changes: 9 additions & 2 deletions hack/jenkins/job-configs/kubernetes-e2e.yaml
View file
Open in desktop
Expand Up @@ -21,14 +21,21 @@
{provider-env}
{job-env}
{post-env}
{runner}
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
echo "Dumping logs for any remaining nodes"
./kubernetes/cluster/log-dump.sh _artifacts
fi
fi
{report-rc}
properties:
- mail-watcher
wrappers:
- ansicolor:
colormap: xterm
- timeout:
timeout: '{timeout}'
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- workspace-cleanup
Expand Down
5 changes: 3 additions & 2 deletions hack/jenkins/job-configs/kubernetes-kubemark.yaml
View file
Open in desktop
Expand Up @@ -8,7 +8,8 @@
{provider-env}
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m {timeout}m {runner} && rc=$? || rc=$?
{report-rc}
properties:
- mail-watcher
publishers:
Expand All @@ -27,7 +28,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: '{timeout}'
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- workspace-cleanup
Expand Down
10 changes: 6 additions & 4 deletions hack/jenkins/job-configs/kubernetes-soak.yaml
View file
Open in desktop
Expand Up @@ -9,7 +9,8 @@
{soak-deploy}
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m 90m {runner} && rc=$? || rc=$?
{report-rc}
properties:
- build-blocker:
use-build-blocker: true
Expand All @@ -24,7 +25,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: 90
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- workspace-cleanup
Expand All @@ -41,7 +42,8 @@
{soak-continuous}
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m 360m {runner} && rc=$? || rc=$?
{report-rc}
properties:
- build-blocker:
use-build-blocker: true
Expand All @@ -60,7 +62,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: 360
timeout: '{jenkins-timeout}'
fail: true
- timestamps

Expand Down
6 changes: 4 additions & 2 deletions hack/jenkins/job-configs/kubernetes-test-go.yaml
View file
Open in desktop
Expand Up @@ -8,7 +8,9 @@
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 && rc=$? || rc=$?
{report-rc}
publishers:
- claim-build
- gcs-uploader
Expand Down Expand Up @@ -47,7 +49,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: '{timeout}'
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- raw:
Expand Down
11 changes: 6 additions & 5 deletions hack/jenkins/job-configs/kubernetes-upgrades.yaml
View file
Open in desktop
Expand Up @@ -70,7 +70,8 @@
# per-step variables, such as whether to run tests
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m 60m {runner} && rc=$? || rc=$?
{report-rc}
properties:
- mail-watcher
publishers:
Expand All @@ -84,7 +85,7 @@
- ansicolor:
colormap: xterm
- timeout:
timeout: 60
timeout: '{jenkins-timeout}'
fail: true
- timestamps
- workspace-cleanup
Expand All @@ -105,7 +106,8 @@
# per-step variables, such as whether to run tests
{job-env}
{post-env}
{runner}
timeout -k {kill-timeout}m 300m {runner} && rc=$? || rc=$?
{report-rc}
properties:
- mail-watcher
publishers:
Expand All @@ -119,8 +121,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
Expand Down