Skip to content

Commit

Permalink
Merge pull request kubernetes#21997 from spxtr/fix-upgrades
Browse files Browse the repository at this point in the history
Send 1.1 upgrade jobs to the proper e2e runner.
  • Loading branch information
fabioy committed Feb 25, 2016
2 parents b94e15d + 1e80292 commit df234d8
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions hack/jenkins/job-configs/kubernetes-upgrades.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,14 @@
version-old: '1.0'
version-new: 'current-release'
runner-old: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.0/hack/jenkins/e2e.sh" | bash -
runner-new: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e-runner.sh" | bash -
runner-new: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e.sh" | bash -
project-env: ''
- '{provider}-{version-old}-{version-new}-upgrades':
provider: 'gke'
version-old: 'stable'
version-new: 'current-release'
runner-old: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e.sh" | bash -
runner-new: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e-runner.sh" | bash -
runner-new: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e.sh" | bash -
project-env: ''

- project:
Expand All @@ -250,5 +250,5 @@
version-old: 'stable'
version-new: 'current-release'
runner-old: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e.sh" | bash -
runner-new: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e-runner.sh" | bash -
runner-new: curl -fsS --retry 3 "https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.1/hack/jenkins/e2e.sh" | bash -
project-env: ''

0 comments on commit df234d8

Please sign in to comment.