Always attempt to download full set of system imgs #501
Conversation
This file contains 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
cjreynol
requested review from
Databean,
jemoreira,
rmuthiah,
jmacnak and
adelva1984
as code owners
|
@Databean would you please review when you have time. Thanks! |
|
@jemoreira brought up the concern that perhaps |
Databean
approved these changes
Apr 10, 2024
The current logic might only download the `system` and `product` images from the system build's `img.zip`. We want the full set of system images if they exist. Since we always download the target files if there is a `--system_build` present we might as well skip the `img.zip` and extract them from the target files. Bug: 333616172 Test: cvd fetch --target_directory=/tmp/cvd/chd_target_files --default_build=git_main/cf_arm64_only_phone-trunk_staging-userdebug --system_build=git_main/cheetah-trunk_staging-userdebug Test: cd /tmp/cvd/fetch_test Test: bsdtar -xf system/<target_files_zip> Test: shasum -b vbmeta_system.zip Test: shasum -b IMAGES/vbmeta_system.zip Test: # the hashes should match
cjreynol
force-pushed
the
single_system_fetch_path
branch
from
348c436
to
6de6004
Compare
The fallback is intended to avoid a regression where the images are not present in the target files but were in the img.zip. It is also possible that we end up extracting the product.img twice with this logic, but I image the case where the target files has the product image but not the system image is rare enough that we are okay without special handling for the case.
|
Added fallback logic for the case pointed out by @jemoreira. |
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.
The current logic might only download the
systemandproductimages from the system build'simg.zip. We want the full set of system images if they exist. That means we always expect asystem.img, the rest are optional.Since we always download the target files if there is a
--system_buildpresent we might as well skip theimg.zipand extract them from the target files.Removed
init_bootfrom the list of system images to fetch. See bug for context.This also fixes that files from this particular codepath were not added to the
fetcher_config.jsonand not de-sparsed.Bug: 333616172
Test: cvd fetch --target_directory=/tmp/cvd/chd_target_files --default_build=aosp-main --system_build=11692693
Test: # slightly older aosp-main build
Test: cd /tmp/cvd/fetch_test
Test: shasum -b vbmeta_system.zip
Test: bsdtar -xf system/<target_files_zip>
Test: shasum -b IMAGES/vbmeta_system.zip
Test: # the hashes should match