[BACKPORT v2.2.x] Make tar creation deterministic #2349
Merged
+30
−8
Conversation
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
for that, we sort entries, override owner+group+mtime and omit ctime+atime (cherry picked from commit d9873c8)
Contributor
|
Looks good to me, you probably also need to cherry-pick 7116985 to make the CI pass 👍 |
Contributor
Author
|
done. There are still 5 failing tests. Do you know if these have other reasons? |
frelon
changed the title
When building a disk image we do not specify the snapshotter, which configures the expansion mechanism to set COS_STATE partition filesystem to ext4. The green flavor uses the btrfs snapshotter, which means when it boots and tries to mount the COS_STATE partition it expects a btrfs filesystem, but finds an ext4 one, which errors. In this commit we add the --snapshotter.type flag to the build-disk command and set the snapshotter in the Makefile accordingly. Signed-off-by: Fredrik Lönnegren <[email protected]>
Contributor
|
Excuse my tardiness, I had some problems testing this on my machine with the latest tumbleweed, but seems to be resolved now. I also cherry-picked 1c06cb4 to this branch, hopefully that's the last backport needed for green tests! 🤞 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Make tar creation deterministic
for that, we sort entries, override owner+group+mtime and omit ctime+atime
See https://reproducible-builds.org/ for why this is good.
(cherry picked from commit d9873c8)