Skip to content

Backport data partition increase and disk rebuilding for 2025.3.1#316

Merged
knuton merged 3 commits intodisk/2025.3.1from
backport-disk-2025.3.1
Feb 11, 2026
Merged

Backport data partition increase and disk rebuilding for 2025.3.1#316
knuton merged 3 commits intodisk/2025.3.1from
backport-disk-2025.3.1

Conversation

@yfyf
Copy link
Collaborator

@yfyf yfyf commented Feb 5, 2026

I created a release/2025.3.1 branch to be able to target the specific release these patches target (instead of the release/2025.3.x branch, which actually does not need patching)

yfyf added 3 commits January 26, 2026 12:07
This is useful if we are in situation where nothing in the actual
release change, but it is the disk building / CI code that changes and
we need to re-run the disk build without creating a new release.
In 5b1a087 I updated `testing/disk/default.nix`, but I forgot
that `testing/disk/releae.nix` is built with different parameters and
had to be updated too.

The 2025.3.3 releaseDisk currently fails the update, since the RAUC
bundle does not fit into persistent storage.
@yfyf yfyf requested a review from knuton February 5, 2026 10:35
@yfyf yfyf added the reviewable Ready for initial or iterative review label Feb 5, 2026
@knuton
Copy link
Member

knuton commented Feb 5, 2026

I created a release/2025.3.1 branch to be able to target the specific release these patches target (instead of the release/2025.3.x branch, which actually does not need patching)

Shall we rename them something else to avoid confusion with actual release branches?

disk/...?

@yfyf
Copy link
Collaborator Author

yfyf commented Feb 5, 2026

I created a release/2025.3.1 branch to be able to target the specific release these patches target (instead of the release/2025.3.x branch, which actually does not need patching)

Shall we rename them something else to avoid confusion with actual release branches?

disk/...?

Not sure, I think that would add further confusion, because ideally the disk should match the release. Having disk/... branches would mean that some release disks are based on release/ branches and some on disk/ branches? Or, alternatively, that each release has a duplicate disk/ branch. It's easy to see from the git history that tag != branch (so e.g. tag 2025.3.1 != release/2025.3.1). Also, here the changes are purely testing / disk related, they do not modify what-would-be-released (i.e. uploaded to dist server) at all. This is not the case in #315, hence why it gets it's own tag with a distinct suffix (-DISK).

@knuton
Copy link
Member

knuton commented Feb 9, 2026

Not sure, I think that would add further confusion, because ideally the disk should match the release. Having disk/... branches would mean that some release disks are based on release/ branches and some on disk/ branches? Or, alternatively, that each release has a duplicate disk/ branch. It's easy to see from the git history that tag != branch (so e.g. tag 2025.3.1 != release/2025.3.1). Also, here the changes are purely testing / disk related, they do not modify what-would-be-released (i.e. uploaded to dist server) at all.

I don't fully understand. I was only thinking of a disk/... branch for the legacy backports, instead of the release/2025.3.1 branch for example.

My concern with having both release/2025.3.x and release/2025.3.1 is that it would be easy to confuse the two (conceptually or by typo).

@knuton knuton added details needed Further information requested to better evaluate changes and removed reviewable Ready for initial or iterative review labels Feb 9, 2026
@yfyf
Copy link
Collaborator Author

yfyf commented Feb 9, 2026

I don't fully understand. I was only thinking of a disk/... branch for the legacy backports, instead of the release/2025.3.1 branch for example.

OK, we can make a disk/$VER branch, but then I probably should create one for the other versions with backports too to keep it consistent. Which, I guess, would mean all versions so far, since (I think) all of them received backported fixes.

The logic for figuring out how (from what commit) a release disk of version $VER was built will then be:

  • check if a disk/$VER branch exists - if it does, that's it
  • otherwise, it was built from the $VER tag as part of a regular release

@yfyf yfyf changed the base branch from release/2025.3.1 to disk/2025.3.1 February 10, 2026 15:31
@yfyf yfyf added reviewable Ready for initial or iterative review and removed details needed Further information requested to better evaluate changes labels Feb 10, 2026
@yfyf
Copy link
Collaborator Author

yfyf commented Feb 10, 2026

Changed target branch to disk/2025.3.1

@knuton knuton removed the reviewable Ready for initial or iterative review label Feb 11, 2026
@knuton knuton merged commit 803a2e6 into disk/2025.3.1 Feb 11, 2026
54 of 55 checks passed
@knuton knuton deleted the backport-disk-2025.3.1 branch February 11, 2026 07:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants