Skip to content

K
k3s
Commit df234d83 authored by Fabio Yeon's avatar Fabio Yeon
Browse files
Options

Merge pull request #21997 from spxtr/fix-upgrades

Send 1.1 upgrade jobs to the proper e2e runner.
parents b94e15d6 1e802923
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
hack/jenkins/job-configs/kubernetes-upgrades.yaml
View file @ df234d83
...@@ -218,14 +218,14 @@ ...@@ -218,14 +218,14 @@
version-old: '1.0' version-old: '1.0'
version-new: 'current-release' 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-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: '' project-env: ''
- '{provider}-{version-old}-{version-new}-upgrades': - '{provider}-{version-old}-{version-new}-upgrades':
provider: 'gke' provider: 'gke'
version-old: 'stable' version-old: 'stable'
version-new: 'current-release' 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-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-env: ''
- project: - project:
...@@ -250,5 +250,5 @@ ...@@ -250,5 +250,5 @@
version-old: 'stable' version-old: 'stable'
version-new: 'current-release' 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-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-env: ''
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment