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

Node E2E: Change the disk eviction test to pull images again after the test. #33201

Merged

Conversation

Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented Sep 21, 2016

Fixes #32022 (comment).

This PR changes the disk eviction test to pull test images again in AfterEach, because images may be evicted during the test.

@yujuhong
/cc @kubernetes/sig-node


This change is Reviewable

@Random-Liu Random-Liu added area/test sig/node Categorizes an issue or PR as relevant to SIG Node. area/node-e2e labels Sep 21, 2016
@Random-Liu Random-Liu changed the title Change the disk eviction test to pull images again after the test. Node E2E: Change the disk eviction test to pull images again after the test. Sep 21, 2016
@Random-Liu Random-Liu added the release-note-none Denotes a PR that doesn't merit a release note. label Sep 21, 2016
@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 21, 2016
if !isImageSupported() {
framework.Logf("test skipped because the image is not supported by the test")
AfterEach(func() {
if !isImageSupported() || !evictionOptionIsSet() { // Skip the after each
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will AfterEach run if the test was already skipped?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I've tried. So I've to check and skip again here.

if !evictionOptionIsSet() {
framework.Logf("test skipped because eviction option is not set")
return
podClient.Delete(busyPodName, &api.DeleteOptions{})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of manually deleting this, can we delete the namespace and wait until all pods are gone?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yujuhong Do you mean that deleting the pod gracefully (maybe with a longer graceful period), and wait for the pod to be deleted instead of deleting containers manually here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean we can rely on the normal cleanup process, instead of the manual cleanup. I don't think longer grace period is required. kubelet should be able to clean up normally, no?

@Random-Liu
Copy link
Member Author

@k8s-bot gce e2e test this #33175.

@Random-Liu
Copy link
Member Author

@yujuhong Addressed comments.

@yujuhong yujuhong added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 21, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins GCE e2e failed for commit fcfe426.

The magic incantation to run this job again is @k8s-bot gce e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@Random-Liu
Copy link
Member Author

@k8s-bot gce e2e test this #33175.

@yujuhong yujuhong added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Sep 22, 2016
@yujuhong
Copy link
Contributor

Marked p1 to help with the test flakes.

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/node-e2e area/test lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants