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.

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

chore: Refactor toolchain versioning #118

Merged
merged 3 commits into from
Oct 7, 2024

Conversation

TimePrinciple
Copy link
Collaborator

Summary of the PR

  • The RUST_TOOLCHAIN is defined separately in each Dockerfile, it's
    easy to be left behind when trying to update rust toolchain version. By
    moving into build_containers.sh, effectively eliminates the
    possibility of having different rust toolchain version on different
    architectures.
  • Previous implementation would produce too much useless hint, which leads
    to unnecessarily long log output.

This PR also updates rust toolchain version to 1.80.1 on riscv64.

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.

The `RUST_TOOLCHAIN` is defined separately in each `Dockerfile`, it's
easy to be left behind when trying to update rust toolchain version. By
moving into `build_containers.sh`, effectively eliminates the
possibility of having different rust toolchain version on different
architectures.

Signed-off-by: Ruoqing He <[email protected]>
Previous implementation would produce too much useless hint, which leads
to unnecessarily long log output.

Signed-off-by: Ruoqing He <[email protected]>
rbradford
rbradford previously approved these changes Oct 4, 2024
Unit-tests in `kvm-ioctls` requires at least 4 cores to pass, change
`MIN_CORES` to 4 to meet that predicate.

Signed-off-by: Ruoqing He <[email protected]>
@TimePrinciple
Copy link
Collaborator Author

Running this version locally:

截屏2024-10-05 15 20 44

It fails because MIN_CORES is set to 3. For this test to pass it requires host to have at least 20 cores present (the divisor is 5). Therefore I changed MIN_CORES to 4:

截屏2024-10-05 15 29 21

Everything works well, the dialing output is effectively reduced :)

@roypat roypat merged commit 59c0814 into rust-vmm:main Oct 7, 2024
3 checks passed
@TimePrinciple TimePrinciple deleted the refactor-toolchain-versioning branch October 7, 2024 07:05
@TimePrinciple TimePrinciple restored the refactor-toolchain-versioning branch October 7, 2024 07:06
@TimePrinciple TimePrinciple deleted the refactor-toolchain-versioning branch October 7, 2024 07:06
TimePrinciple added a commit to TimePrinciple/rust-vmm-ci that referenced this pull request Oct 7, 2024
Version v47 [1] incorporates:
- chore: Move RUST_TOOLCHAIN into build_container.sh
- chore: Refactor dialing to reduce useless hints
- riscv64: Set MIN_CORES to 4

[1] rust-vmm/rust-vmm-container#118

Signed-off-by: Ruoqing He <[email protected]>
ShadowCurse pushed a commit to rust-vmm/rust-vmm-ci that referenced this pull request Oct 7, 2024
Version v47 [1] incorporates:
- chore: Move RUST_TOOLCHAIN into build_container.sh
- chore: Refactor dialing to reduce useless hints
- riscv64: Set MIN_CORES to 4

[1] rust-vmm/rust-vmm-container#118

Signed-off-by: Ruoqing He <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants