Skip to content

Commit

Permalink
Merge pull request kubernetes#21897 from spxtr/fix-upgrades
Browse files Browse the repository at this point in the history
Auto commit by PR queue bot
  • Loading branch information
k8s-merge-robot committed Feb 24, 2016
2 parents 449f118 + 8f8aec4 commit 3f7705b
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions hack/jenkins/job-configs/kubernetes-upgrades.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
export E2E_DOWN="false"
- 'kubernetes-upgrade-{provider}-{version-old}-{version-new}-{step}':
step: 'step2-kubectl-e2e-new'
runner: '{runner-new}'
description: 'Run {version-new} kubectl tests against the cluster running {version-old}.'
job-env: |
export E2E_OPT="--check_version_skew=false"
Expand All @@ -144,6 +145,7 @@
export GINKGO_TEST_ARGS="--ginkgo.focus=Kubectl"
- 'kubernetes-upgrade-{provider}-{version-old}-{version-new}-{step}':
step: 'step3-upgrade-master'
runner: '{runner-new}'
description: 'Upgrade the master from {version-old} to {version-new}.'
job-env: |
export E2E_OPT="--check_version_skew=false"
Expand All @@ -160,6 +162,7 @@
export E2E_DOWN="false"
- 'kubernetes-upgrade-{provider}-{version-old}-{version-new}-{step}':
step: 'step5-upgrade-cluster'
runner: '{runner-new}'
description: 'Upgrade the nodes from {version-old} to {version-new}.'
job-env: |
export E2E_OPT="--check_version_skew=false"
Expand All @@ -176,6 +179,7 @@
export E2E_DOWN="false"
- 'kubernetes-upgrade-{provider}-{version-old}-{version-new}-{step}':
step: 'step7-e2e-new'
runner: '{runner-new}'
description: 'Run {version-new} e2e tests against the cluster with master and nodes at {version-new}.'
job-env: |
# TODO(15011): these really shouldn't be (very) version skewed, but
Expand Down

0 comments on commit 3f7705b

Please sign in to comment.