runc-1.2.0 merge followups#48766
Merged
thaJeztah merged 2 commits intomoby:masterfrom Nov 19, 2024
Merged
Conversation
This is not needed since commit a6d5b48 ("vendor: github.com/opencontainers/runc v1.2.0"). Signed-off-by: Kir Kolyshkin <[email protected]>
Some other tests on this file where skipped with this same line. Let's skip this one, that seems to be flaky too. Signed-off-by: Rodrigo Campos <[email protected]>
f1647cf to
f96994e
Compare
thaJeztah
approved these changes
Nov 19, 2024
Member
thaJeztah
left a comment
There was a problem hiding this comment.
LGTM, sorry looks like I forgot this one
I did a quick rebase to get a fresh run of CI
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
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.
A few cherry-picks from my and @rata work on using runc v1.2.0 here which did not make it.
There are some more commits from @rata here fixing some of the test flakiness we observed when trying to bump runc. Apparently they are no longer needed, but maybe some of them still make sense.