[release 1.7] Fix CI#11722
Merged
dmcgowan merged 7 commits intocontainerd:release/1.7from Apr 21, 2025
Merged
Conversation
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit removes v1 runtime from integration tests. These rely on cgroups v1, which are disabled on Ubuntu 24 in favor of cgroups v2. See more context here: containerd#9502 (comment) Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Member
|
Looking at the repeated failures this is the ipv6 setxmark problem and the restore-criu-on-arm; both have been disabled in main and release/2.0, so I assume to fix CI we need both of those PRs backported to release/1.7 as well :( |
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
estesp
approved these changes
Apr 21, 2025
dmcgowan
approved these changes
Apr 21, 2025
2 tasks
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
6 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.
Fix CI in 1.7
Tried to also cherry-pick 027414e, but it produces merge conflicts. So had to patch it manually.