Fix member path in hyperv ZIP
#3524
Merged
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
|
/retest |
dustymabe
previously approved these changes
Jun 28, 2023
| # the compressor embeds the input filename in its output, so | ||
| # strip the .gz or .zip suffix from the uncompressed file | ||
| uncompressed_path = os.path.splitext(final_img)[0] | ||
| os.rename(final_img, uncompressed_path) |
There was a problem hiding this comment.
with the
log.info(f"Moving {work_img} to {final_img}")
shutil.move(work_img, final_img)
from above this feels a bit like musical chairs, but I don't really see a better way.
gzip and zip both embed the input filename in the output archive, and we're currently including the compression extension (.gz or .zip) in that name. For gzip this is harmless, since gunzip ignores it unless -N is specified. For zip (currently used only in hyperv), the member filename is not ignored during decompression, so the decompressed output claims to be another ZIP file but isn't. Fix this by stripping the last filename extension from the uncompressed file before compressing.
Place the disk image at the root of the ZIP file, skipping its containing directories.
|
@bgilbert: The following test failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
The RHCOS test has been timing out lately. Merging over red. |
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
hypervZIP has two problems:.vhdxextension, but has.vhdx.zipinstead.Fix both issues.