Skip to content

runc-1.2.0 merge followups#48766

Merged
thaJeztah merged 2 commits intomoby:masterfrom
kolyshkin:runc120-followups
Nov 19, 2024
Merged

runc-1.2.0 merge followups#48766
thaJeztah merged 2 commits intomoby:masterfrom
kolyshkin:runc120-followups

Conversation

@kolyshkin
Copy link
Copy Markdown
Contributor

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.

Copy link
Copy Markdown
Contributor

@rata rata left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

kolyshkin and others added 2 commits November 19, 2024 12:44
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]>
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, sorry looks like I forgot this one

I did a quick rebase to get a fresh run of CI

@thaJeztah thaJeztah added this to the 28.0.0 milestone Nov 19, 2024
@thaJeztah thaJeztah merged commit 84ad184 into moby:master Nov 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants