Streamline rootfs building#5727
Open
JamesC1305 wants to merge 2 commits intofirecracker-microvm:mainfrom
Open
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #5727 +/- ##
=======================================
Coverage 83.17% 83.17%
=======================================
Files 277 277
Lines 29428 29428
=======================================
Hits 24478 24478
Misses 4950 4950
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
6150647 to
7147cd6
Compare
Move code from CI rootfs rebuild script into common functions file. This will allow it to be shared with the docker popular code as well. Refactor it slightly too, so that it takes another bash script as a parameter that we then run inside the docker image. This is what allows the implementation to be shared with docker-popular – all of the build-specific functionality is defined inside the supplied script. Signed-off-by: James Curtis <jxcurtis@amazon.co.uk>
Simplify the docker-popular rootfs building using common functions. Define a new file `setup-minimal.sh` that is responsible for the image-specific setups. Also, use squashfs for test-popular-containers tests, as there is no specific reason for them to be ext4. Signed-off-by: James Curtis <jxcurtis@amazon.co.uk>
7147cd6 to
a140d81
Compare
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
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.
Changes
Move
rebuild.shrootfs building code into commonfunctionsfile and refactor slightly, allowing the function to take an extra script as a parameter, with that script being run inside the container. This allows different behaviour to be specified for CI rootfs and docker popular rootfs.Then change test-docker-popular to reuse this common rootfs builder code.
NB: docker-popular now uses squashfs rather than ext4 as before.
Reason
We currently have two very similar processes for building rootfs. One for building a CI rootfs, and another for running Firecracker in popular docker images (test-docker-popular). We should instead have a common implementation that works for both, for easier extensibility and maintainability.
License Acceptance
By submitting this pull request, I confirm that my contribution is made under
the terms of the Apache 2.0 license. For more information on following Developer
Certificate of Origin and signing off your commits, please check
CONTRIBUTING.md.PR Checklist
tools/devtool checkbuild --allto verify that the PR passesbuild checks on all supported architectures.
tools/devtool checkstyleto verify that the PR passes theautomated style checks.
how they are solving the problem in a clear and encompassing way.
in the PR.
CHANGELOG.md.Runbook for Firecracker API changes.
integration tests.
TODO.rust-vmm.