Skip to content

cri: fix integration test on cgroupsv2 system#6595

Merged
estesp merged 1 commit intocontainerd:mainfrom
zhsj:fix-cri-test
Mar 4, 2022
Merged

cri: fix integration test on cgroupsv2 system#6595
estesp merged 1 commit intocontainerd:mainfrom
zhsj:fix-cri-test

Conversation

@zhsj
Copy link
Copy Markdown
Contributor

@zhsj zhsj commented Feb 27, 2022

TestUpdateContainerResources_MemoryLimit still uses old method to
check memlimit in cgroup.

BTW, should we enable cgroupsv2 integration test in CI?

@k8s-ci-robot
Copy link
Copy Markdown

Hi @zhsj. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Feb 27, 2022

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Feb 27, 2022

Build succeeded.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Feb 27, 2022

Build succeeded.

TestUpdateContainerResources_MemoryLimit still uses old method to
check memlimit in cgroup.

Signed-off-by: Shengjing Zhu <[email protected]>
@estesp
Copy link
Copy Markdown
Member

estesp commented Feb 28, 2022

BTW, should we enable cgroupsv2 integration test in CI?

We have cgroups v2 testing happening in 2 places, both by running a nested VM running Fedora 35:

  1. the unit tests in the containerd/cgroups project run in a VM with v2 enabled
  2. here in the main containerd project, the 2 jobs starting with "CI / CGroupsV2 - ..." in the name run the tests with v2 enabled (via Fedora 35 in a VM).

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Feb 28, 2022

Build succeeded.

@zhsj
Copy link
Copy Markdown
Contributor Author

zhsj commented Feb 28, 2022

here in the main containerd project, the 2 jobs starting with "CI / CGroupsV2 - ..." in the name run the tests with v2 enabled (via Fedora 35 in a VM).

Yes, but only integration test(code in integration/client) has been run. CRI integration is not.

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Mar 2, 2022

/ok-to-test

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Mar 2, 2022

here in the main containerd project, the 2 jobs starting with "CI / CGroupsV2 - ..." in the name run the tests with v2 enabled (via Fedora 35 in a VM).

Yes, but only integration test(code in integration/client) has been run. CRI integration is not.

two cri integration buckets are available 1) kubernetes-sigs/cri-tools .. critest and 2) containerd/script/test/cri-integration.sh

Don't think we've tried containerd/script integration yet with v2 enabled in fedora..

Also not sure how much of CGroupsV2 is being tested right now in the k8s prow driven node e2e bucket. They've had some features enable now so I would expect some buckets to be there.

@zhsj
Copy link
Copy Markdown
Contributor Author

zhsj commented Mar 2, 2022

Don't think we've tried containerd/script integration yet.

https://github.com/containerd/containerd/blob/main/.github/workflows/ci.yml#L397 Only on ubuntu-18.04.

I'm not sure it should be added to vagrant based cgroupsv2 CI. It may become more flaky...

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Mar 2, 2022

Don't think we've tried containerd/script integration yet.

https://github.com/containerd/containerd/blob/main/.github/workflows/ci.yml#L397 Only on ubuntu-18.04.

I'm not sure it should be added to vagrant based cgroupsv2 CI. It may become more flaky...

nod it wasn't written to run in a vagrant vm.. vague memory of some restart tests that would/may require a different design..

Copy link
Copy Markdown
Member

@kzys kzys left a comment

Choose a reason for hiding this comment

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

This PR itself is ready to go.

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

@estesp estesp merged commit 5427aec into containerd:main Mar 4, 2022
@zhsj zhsj deleted the fix-cri-test branch March 4, 2022 18:48
@fuweid fuweid added cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-pick/1.6.x and removed cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch cherry-pick/1.6.x labels Jan 14, 2024
sir-xw pushed a commit to openkylin/containerd that referenced this pull request Apr 23, 2025
Forwarded: containerd/containerd#6595

Gbp-Pq: Name 0007-cri-fix-integration-test-on-cgroupsv2-system.patch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cherry-picked/1.6.x PR commits are cherry-picked into release/1.6 branch ok-to-test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants