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.

Sign up for GitHub

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

Jump to bottom

Make ext2 the default FS for recovery on disks #1995

Merged
merged 2 commits into from
Mar 7, 2024
Merged

Make ext2 the default FS for recovery on disks #1995

merged 2 commits into from
Mar 7, 2024

Conversation

davidcassany
Copy link
Contributor

No description provided.

@davidcassany
Make ext2 the default FS for recovery on disks
b609554 
Signed-off-by: David Cassany <dcassany@suse.com>
@davidcassany davidcassany requested a review from a team as a code owner March 7, 2024 10:13
@davidcassany davidcassany mentioned this pull request Mar 7, 2024
Closed
@davidcassany
Adding empty commit
f24687b 
Signed-off-by: David Cassany <dcassany@suse.com>
@davidcassany
Copy link
Contributor Author

Confirmed in test logs that the disk was build with ext2

INFO[2024-03-07T10:40:47Z] Creating image /build/build/recovery/recovery.img from rootDir /build/build/recovery.img.root 
DEBU[2024-03-07T10:40:47Z] Image size 891M                              
DEBU[2024-03-07T10:40:47Z] Running cmd: 'mkfs.ext2 -L COS_SYSTEM -d /build/build/recovery.img.root /build/build/recovery/recovery.img'

frelon
frelon approved these changes Mar 7, 2024
View reviewed changes
Copy link
Contributor

@frelon frelon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice! Looks like you need to update the tests as well, approving anyways 👍

@davidcassany
Copy link
Contributor Author

Nice! Looks like you need to update the tests as well, approving anyways 👍

Yes, gonna force merge. Then make v2 available and then update tests to actually use v1.1.4 for upgrade tests and v2.0.0 for downgrade and recovery tests. So they will be green again and testing actual tags.

@davidcassany davidcassany merged commit d522f6f into rancher:main Mar 7, 2024
15 of 19 checks passed
@davidcassany davidcassany deleted the switch_recovery_default_to_ext_for_recovery_on_disks branch March 7, 2024 12:28
@frelon
Copy link
Contributor

frelon commented Mar 7, 2024

Nice! Looks like you need to update the tests as well, approving anyways 👍

Yes, gonna force merge. Then make v2 available and then update tests to actually use v1.1.4 for upgrade tests and v2.0.0 for downgrade and recovery tests. So they will be green again and testing actual tags.

Ah, I was thinking of the cli unit-tests which expect "mksquashfs" to be called.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@frelon frelon frelon approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Elemental
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@davidcassany @frelon