Skip to content

Upgrade ubuntu:22.04 to ubuntu:24.04 #122

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
Merged
merged 4 commits into from
Mar 4, 2025
Merged

Upgrade ubuntu:22.04 to ubuntu:24.04 #122

merged 4 commits into from
Mar 4, 2025

Conversation

RuoqingHe
Copy link
Member

@RuoqingHe RuoqingHe commented Feb 14, 2025 •
edited
Loading

Summary of the PR

Our downstream communities (cloud-hypervisor, firecracker, kata-containers and etc.) are upgrading to Ubuntu 24.04, propose to catch up.

  • base image: Upgrade from Ubuntu 22.04 to 24.04
  • ci: Remove work around for aarch64
  • build_container: Add p flag while mkdir for dbus
  • riscv64: Replace id_rsa.pub with *.pub

Requirements

Before submitting your PR, please make sure you addressed the following
requirements:

  • All commits in this PR have Signed-Off-By trailers (with
    git commit -s), and the commit message has max 60 characters for the
    summary and max 75 characters for each description line.
  • All added/changed functionality has a corresponding unit/integration
    test.
  • All added/changed public-facing functionality has entries in the "Upcoming
    Release" section of CHANGELOG.md (if no such section exists, please create one).
  • Any newly added unsafe code is properly documented.

@stefano-garzarella stefano-garzarella marked this pull request as draft February 14, 2025 13:59
@RuoqingHe
Copy link
Member Author

It looks like there are some problems with our CI, and I couldn't find /dev/.buildkit_qemu_emulator anywhere 🧐

@RuoqingHe
Copy link
Member Author

Good news, thanks to @roypat's advice, cargo-audit is passing; bad news, cargo-fuzz is failing 😂

See https://github.com/TimePrinciple/rust-vmm-container/actions/runs/13375316552/job/37353170361?pr=2

@stefano-garzarella
Copy link
Member

@RuoqingHe can we close this or it's something we want to explore?

@RuoqingHe
Copy link
Member Author

RuoqingHe commented Feb 18, 2025 •
edited
Loading

@RuoqingHe can we close this or it's something we want to explore?

Can we keep this, I intended to propose upgrading to 24.04, maybe this is a bit early, but 22.04 will meet its EOL anyway 🥺

I will update the commit tomorrow

@roypat
Copy link
Member

roypat commented Feb 18, 2025

this reminds me that I still need to look into upgrading the CI hosts to ubuntu 24 as well at some point haha

@RuoqingHe RuoqingHe force-pushed the upgrade-to-ubuntu-24.04 branch 2 times, most recently from 2037aa0 to 57e032c Compare February 19, 2025 01:12
@RuoqingHe RuoqingHe marked this pull request as ready for review February 24, 2025 10:41
@RuoqingHe RuoqingHe mentioned this pull request Feb 25, 2025
Closed
stefano-garzarella
stefano-garzarella reviewed Feb 25, 2025
View reviewed changes
Copy link
Member

@stefano-garzarella stefano-garzarella left a comment

Choose a reason for hiding this comment

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

Our downstream are upgrading to Ubuntu 24.04 in the first commit is not really clear, please specify which are "Our downstream".

The rest LGTM, I left a small comment for the last patch.

@RuoqingHe RuoqingHe force-pushed the upgrade-to-ubuntu-24.04 branch from 5b16a7f to eb1cbb4 Compare February 25, 2025 13:43
@RuoqingHe
base image: Upgrade from Ubuntu 22.04 to 24.04
688591f 
Our downstream communities (cloud-hypervisor, firecracker,
kata-containers and etc.) are upgrading to Ubuntu 24.04, propose to
catch up here.

Update the package list for Ubuntu 24.04.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
@RuoqingHe
ci: Remove work around for aarch64
b7a399d 
Remove work around required for building dev image for `aarch64`
architecture, introduced in commit 538dba3.

This is address by ubuntu:24:04.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
@RuoqingHe
build_container: Add p flag while mkdir for dbus
5cc11a3 
`/run/dbus` is created in advance on `riscv64`, adding `p` flag for
`mkdir`.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
@RuoqingHe
riscv64: Replace id_rsa.pub with *.pub
f35ba27 
Encryption algorithm is changed after bumping to ubuntu:24:04,
ubuntu:22.04 is using RSA while ubuntu:24.04 is using Ed25519.

Replace `id_rsa.pub` with `*.pub` to avoid possible encryption algorithm
change.

Signed-off-by: Ruoqing He <heruoqing@iscas.ac.cn>
@RuoqingHe RuoqingHe force-pushed the upgrade-to-ubuntu-24.04 branch from eb1cbb4 to f35ba27 Compare February 26, 2025 07:59
stefano-garzarella
stefano-garzarella approved these changes Mar 4, 2025
View reviewed changes
Copy link
Member

@stefano-garzarella stefano-garzarella left a comment

Choose a reason for hiding this comment

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

@RuoqingHe thanks, this LGTM and should fix the issue we have in rust-vmm/vhost-device#820

roypat
roypat approved these changes Mar 4, 2025
View reviewed changes
Copy link
Member

@roypat roypat left a comment

Choose a reason for hiding this comment

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

Thanks for doing this!

@roypat roypat merged commit d0c5d50 into rust-vmm:main Mar 4, 2025
3 checks passed
@RuoqingHe RuoqingHe deleted the upgrade-to-ubuntu-24.04 branch March 4, 2025 09:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stefano-garzarella stefano-garzarella stefano-garzarella approved these changes

@roypat roypat roypat approved these changes

@andreeaflorescu andreeaflorescu Awaiting requested review from andreeaflorescu andreeaflorescu is a code owner

@lauralt lauralt Awaiting requested review from lauralt lauralt is a code owner

@stsquad stsquad Awaiting requested review from stsquad stsquad is a code owner

@ShadowCurse ShadowCurse Awaiting requested review from ShadowCurse ShadowCurse is a code owner

@TimePrinciple TimePrinciple Awaiting requested review from TimePrinciple

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RuoqingHe @stefano-garzarella @roypat