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.

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

Fix the fix for taint scheduler predicate test #29003

Merged
merged 1 commit into from
Jul 15, 2016
Merged

Conversation

gmarek
Copy link
Contributor

@gmarek gmarek commented Jul 15, 2016

No description provided.

@wojtek-t wojtek-t added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 15, 2016
@gmarek
Copy link
Contributor Author

gmarek commented Jul 15, 2016

Merging to unbreak the test

@gmarek gmarek merged commit d1ff1b9 into kubernetes:master Jul 15, 2016
@kevin-wangzefeng
Copy link
Member

The failure is caused by the change of removing taint (originally expected taint removed before relaunching the pod, but we do need also make sure taint are removed when the test exit with error). I will try to fix it.

k8s-github-robot pushed a commit that referenced this pull request Jul 29, 2016
…s-e2e

Automatic merge from submit-queue

Remove redundant pod deletion in scheduler predicates tests and fix taints-tolerations e2e

~~In scheduler predicates test, some tests won't clean pods they created when exit with failure, which may lead to pod leak. This PR is to fix it.~~

Remove redundant pod deletion in scheduler predicates tests, since framework.AfterEach() already did the cleanup work after every test.

Also fix the test "validates that taints-tolerations is respected if not matching", refer to the change on taint-toleration test in #29003, and #24134 (comment).
@gmarek gmarek deleted the taint branch August 30, 2016 09:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants