Skip to content

[release/1.6] cri: relax test for system without hugetlb#6623

Merged
fuweid merged 1 commit intocontainerd:release/1.6from
kzys:fix-6611
Mar 5, 2022
Merged

[release/1.6] cri: relax test for system without hugetlb#6623
fuweid merged 1 commit intocontainerd:release/1.6from
kzys:fix-6611

Conversation

@kzys
Copy link
Copy Markdown
Member

@kzys kzys commented Mar 4, 2022

These unit tests don't check hugetlb. However by setting
TolerateMissingHugetlbController to false, these tests can't
be run on system without hugetlb (e.g. Debian buildd).

Signed-off-by: Shengjing Zhu [email protected]
(cherry picked from commit 352a8f4)

These unit tests don't check hugetlb. However by setting
TolerateMissingHugetlbController to false, these tests can't
be run on system without hugetlb (e.g. Debian buildd).

Signed-off-by: Shengjing Zhu <[email protected]>
(cherry picked from commit 352a8f4)
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown

@utkarsh2102 utkarsh2102 left a comment

Choose a reason for hiding this comment

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

This works for me! :)

Copy link
Copy Markdown
Member

@fuweid fuweid left a comment

Choose a reason for hiding this comment

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

LGTM

@fuweid fuweid merged commit d125167 into containerd:release/1.6 Mar 5, 2022
@thaJeztah
Copy link
Copy Markdown
Member

backport of #6596

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.

6 participants