Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move to 24.04 for docker tests #3178

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Move to 24.04 for docker tests #3178

merged 1 commit into from
Jul 9, 2024

Conversation

apostasie
Copy link
Contributor

@apostasie apostasie commented Jul 5, 2024 •
edited
Loading

I am assuming this will fail until we fix the issue in #3147 but curious what else is there to fix.

Draft for now.

@apostasie
Copy link
Contributor Author

Rebasing on top of #3177
Let's see what goes.

@AkihiroSuda AkihiroSuda linked an issue Jul 5, 2024 that may be closed by this pull request
test-integration-docker-compatibility: update to Ubuntu 24.04 #3146
Closed
@apostasie apostasie force-pushed the dev-3146 branch 4 times, most recently from 166b32b to c98117f Compare July 5, 2024 08:16
@apostasie
Copy link
Contributor Author

List of amendments:

  • fixing --kill.daemon (other PR)

  • TestRunCgroupParent - invalid cgroup name to compare with (faulty assumption that nerdctl was the only one of the two with systemd cgroup)

  • TestTailFollowRotateLogs - somewhat unrelated, but a significant source of flakyness it seems - using Combined to test is a mistake, too short a timeout, not checking for empty lines - also, our code needs to be fixed as well (applied a bandaid in the meantime)

@apostasie apostasie marked this pull request as ready for review July 5, 2024 17:10
@apostasie
Copy link
Contributor Author

@AkihiroSuda I think this is ready.

The only failure on the last run is unrelated.

PTAL at your convenience.

@apostasie apostasie mentioned this pull request Jul 5, 2024
Merged
@apostasie apostasie requested a review from AkihiroSuda July 5, 2024 20:30
@apostasie apostasie mentioned this pull request Jul 6, 2024
Closed
3 tasks
@apostasie
Copy link
Contributor Author

Rebasing against main for good measure.

@apostasie
Copy link
Contributor Author

1 failure - IPFS

I think this is good to go @AkihiroSuda

@AkihiroSuda AkihiroSuda added this to the v2.0.0 milestone Jul 8, 2024
@AkihiroSuda AkihiroSuda added the area/ci e.g., CI failure label Jul 8, 2024
@apostasie apostasie mentioned this pull request Jul 8, 2024
Merged
@apostasie
Copy link
Contributor Author

@AkihiroSuda done

AkihiroSuda
AkihiroSuda approved these changes Jul 9, 2024
View reviewed changes
Copy link
Member

@AkihiroSuda AkihiroSuda left a comment

Choose a reason for hiding this comment

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

Thanks

@AkihiroSuda AkihiroSuda merged commit 0f1d269 into containerd:main Jul 9, 2024
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees
No one assigned
Labels
area/ci e.g., CI failure
Projects
None yet
Milestone
v2.0.0
Development

Successfully merging this pull request may close these issues.

test-integration-docker-compatibility: update to Ubuntu 24.04
2 participants
@apostasie @AkihiroSuda