Skip to content

Conversation

karencfv
Copy link
Contributor

@karencfv karencfv commented Aug 13, 2025

This turned out to be way easier than I anticipated. @jgallagher I know this clashes with your host OS planner PR, happy to hold off merging this until you merge your PR if you prefer 😄

Related: #8798

version: version.to_string(),
sign: None,
sign: Some(board),
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Tufaceous uses the board name as the sign for the artifact's cabooses

https://github.com/oxidecomputer/tufaceous/blob/570f7cbd227a6522afdf6cc0c2bfafb08f2efdbd/lib/src/assemble/manifest.rs#L450-L470

We can do the same here

Copy link
Contributor

@jgallagher jgallagher left a comment

Choose a reason for hiding this comment

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

I think it's fine to land this before the host OS planner stuff; that's going to be a little while longer before it's ready. If you change the inputs to use latest instead of raw UUIDs, fixing up the merge conflicts shouldn't be too bad.

@@ -31,46 +31,78 @@ sled-list
blueprint-list
inventory-list

# First step: upgrade one SP.
# First step: upgrade one RoT.
blueprint-plan dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 f45ba181-4b56-42cc-a762-874d90184a43
Copy link
Contributor

Choose a reason for hiding this comment

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

I realized this way too late when I was working in this file, but: you can change all of the blueprint-plan lines to

Suggested change
blueprint-plan dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 f45ba181-4b56-42cc-a762-874d90184a43
blueprint-plan latest latest

(for "base of the latest blueprint" and "use the latest collection") to avoid having to manually shuffle all these UUIDs around when we make changes.

@@ -31,46 +31,78 @@ sled-list
blueprint-list
inventory-list

# First step: upgrade one SP.
# First step: upgrade one RoT.
blueprint-plan dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 f45ba181-4b56-42cc-a762-874d90184a43
blueprint-diff dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
Copy link
Contributor

Choose a reason for hiding this comment

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

Similarly, all of these can be just

Suggested change
blueprint-diff dbcbd3d6-41ff-48ae-ac0b-1becc9b2fd21 8da82a8e-bf97-4fbd-8ddd-9f6462732cf1
blueprint-diff latest

for "diff the latest blueprint against its parent".

@karencfv karencfv enabled auto-merge (squash) August 13, 2025 21:34
@karencfv karencfv disabled auto-merge August 13, 2025 21:54
@karencfv
Copy link
Contributor Author

I've merged #8664. So, I'll update this PR to include RoT bootloader tests as well. I can't merge this PR as is because once the cabooses have a SIGN the planner automatically tries to update the RoT bootloader before the bootloader.

@karencfv
Copy link
Contributor Author

karencfv commented Aug 14, 2025

Ugh, I don't know what is going on here. I merged main into my branch and it still says there are branch conflicts 😒

EDIT: #8631 was merged 😄

Copy link
Contributor Author

@karencfv karencfv left a comment

Choose a reason for hiding this comment

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

I've updated the PR to include testing RoT bootloader as well. Would appreciate another look!

@karencfv karencfv requested a review from jgallagher August 14, 2025 03:55
@karencfv
Copy link
Contributor Author

Will merge as it had merge conflicts a couple of times now and tomorrow is Saturday for me. It's only tests so we can adjust these if necessary.

@karencfv karencfv merged commit d38f64b into oxidecomputer:main Aug 15, 2025
16 checks passed
@karencfv karencfv deleted the recongifurator-sim-sys-populate-caboose-sign branch August 15, 2025 02:15
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