Skip to content

Fix oom tests on non Linux#5245

Merged
mxpv merged 1 commit intocontainerd:masterfrom
mxpv:oom
Mar 23, 2021
Merged

Fix oom tests on non Linux#5245
mxpv merged 1 commit intocontainerd:masterfrom
mxpv:oom

Conversation

@mxpv
Copy link
Copy Markdown
Member

@mxpv mxpv commented Mar 23, 2021

OOM procfs is linux specific, so should not be running on mac os, freebsd, etc.

Signed-off-by: Maksym Pavlenko [email protected]

@mxpv mxpv requested a review from samuelkarp March 23, 2021 00:52
Copy link
Copy Markdown
Member

@dims dims left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83
Copy link
Copy Markdown
Member

Needs rebase.

Signed-off-by: Maksym Pavlenko <[email protected]>
@mxpv
Copy link
Copy Markdown
Member Author

mxpv commented Mar 23, 2021

Rebased

Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@mxpv mxpv merged commit 792336b into containerd:master Mar 23, 2021
@mxpv mxpv deleted the oom branch March 23, 2021 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants