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

Fix 1.2 paused deployment test failure against >1.4 cluster #32904

Merged
merged 1 commit into from
Sep 17, 2016
Merged

Fix 1.2 paused deployment test failure against >1.4 cluster #32904

merged 1 commit into from
Sep 17, 2016

Conversation

janetkuo
Copy link
Member

@janetkuo janetkuo commented Sep 16, 2016 •
edited
Loading

What this PR does / why we need it: Fixing upgrade test kubernetes-e2e-gke-1.2-1.4-upgrade-cluster

Proportionally scale deployments was introduced in v1.4 (#20273),
which caused this 1.2 test to fail on 1.4 clusters.
This is cherrypicked into 1.2 merely for fixing test failues on
kubernetes-e2e-gke-1.2-1.4-upgrade-cluster

Which issue this PR fixes (optional, in fixes #<issue number>(, #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #32698

Special notes for your reviewer: Code change is from https://github.com/kubernetes/kubernetes/blob/release-1.4/test/e2e/deployment.go#L663-L692

Release note:

This change is Reviewable

@janetkuo
Fix 1.2 paused deployment test failure against >1.4 cluster
cfc8168 
Proportionally scale deployments was introduced in v1.4 (kubernetes#20273),
which caused this 1.2 test to fail on 1.4 clusters.
This is cherrypicked into 1.2 merely for fixing test failues on
kubernetes-e2e-gke-1.2-1.4-upgrade-cluster
@janetkuo janetkuo added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. cherrypick-candidate release-note-none Denotes a PR that doesn't merit a release note. labels Sep 16, 2016
@janetkuo janetkuo added this to the 1.2 milestone Sep 16, 2016
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 16, 2016
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@jessfraz jessfraz modified the milestones: v1.4, 1.2 Sep 16, 2016
@eparis eparis modified the milestones: v1.2, v1.4 Sep 16, 2016
@pwittrock pwittrock assigned jessfraz and unassigned pwittrock Sep 16, 2016
@jessfraz jessfraz added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 16, 2016
@k8s-github-robot
Copy link

@jfrazelle
You must link to the test flake issue which caused you to request this manual re-test.
Re-test requests should be in the form of: k8s-bot test this issue: #<number>
Here is the list of open test flakes.

@pwittrock pwittrock added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Sep 17, 2016
@pwittrock
Copy link
Member

@k8s-bot test this issue: #IGNORE

@k8s-bot
Copy link

k8s-bot commented Sep 17, 2016

GCE e2e build/test passed for commit cfc8168.

@pwittrock pwittrock merged commit 33829eb into kubernetes:release-1.2 Sep 17, 2016
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.2" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#32904 from janetkuo/1.2-1.4-skew-paused…
e172456 
…-deployment

Fix 1.2 paused deployment test failure against >1.4 cluster
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jessfraz jessfraz

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.
8 participants
@janetkuo @k8s-cherrypick-bot @k8s-github-robot @pwittrock @k8s-bot @jessfraz @googlebot @eparis