[1.5] tests/int: fix flake in "resources.unified override" (backport #5269)#5286
Merged
Merged
Conversation
lifubang
force-pushed
the
backport-5269-1.5
branch
from
d6d6ae5 to
3229d47
Compare
lifubang
changed the title
kolyshkin
approved these changes
May 18, 2026
Member
|
I can't understand why this PR can't be merged, all checks pass and it has 2 approvals. It doesn't have conflicts, but the branch is out of date with the base branch. I enabled auto-merge, but that didn't do the trick. I'll click "rebase branch", as I think this is just a github bug and the rebase shouldn't cause any merge commit (the other option is to merge latest 1.5 with this). Let's see if I can merge after that |
As runc binary grows in size over time (new features, more dependencies) some tests start to flake because of low memory limits. One such test is "runc run (cgroup v2 resources.unified override)"; it obviously fails because of 1M memory limit: > runc run failed: unable to start container process: container init was OOM-killed (memory limit too low?) Increase the limits 4x. Do the same for the "unified only" test. Fixes issue 5264. Reported-by: Kevin Berry <kpberry11@gmail.com> Reported-by: Ricardo Branco <rbranco@suse.de> Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 3fabb4d) Signed-off-by: lifubang <lifubang@acmcoder.com> Co-authored-by: Claude <noreply@anthropic.com>
Member
|
Okay, the rebase did the trick and github realized it could be merged |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
(cherry picked from commit 3fabb4d070a8a0e583e4c639949e9306610cba)