Skip to content

Conversation

iximeow
Copy link
Member

@iximeow iximeow commented Oct 13, 2025

Propolis changes:

Crucible changes:

Crucible shouldn't have functional changes here, Propolis' big ones are @sunshowers' work moving Propolis to versioned APIs, plus propolis#960 turning the crank on MAXCPU.

propolis#961 changes the initial Milan CPU profile one last time before the release in service of propolis#959. Propolis will clear this bit. Later we want to actually set up leaf 8000_001E, so after this merges I'll have a followup to remove that leaf from the inital Milan definition to keep the profile constant when propolis-server is smarter about the leaf.

@leftwo
Copy link
Contributor

leftwo commented Oct 13, 2025

I think we would need to also bump the crucible git rev in the cargo.toml and also in the package-manifest.toml to the same version that crucible is in the propolis version you are updating to here. Otherwise propolis will have a different compiled version than what Omicron/Nexus has, and the downstairs will come from a package that is at a different revision as well.

@iximeow
Copy link
Member Author

iximeow commented Oct 13, 2025

oh, yes, you're right. I'd only noticed the Crucible bump while looking at Propolis changes and forgot we have revs here too. I was also distracted by the (I think) flake in https://buildomat.eng.oxide.computer/wg/0/details/01K7FEEGS766GRVD9CVQN335B2/Y6RoWuCOWY9T52pA6RzMDnb6PwDV7bNwme0VY4fo1QMJQg0E/01K7FEF1PJQFT98MRGX5C1JHNG ..

@iximeow
Copy link
Member Author

iximeow commented Oct 13, 2025

(I expect CI worked basically only because Crucible hasn't actually changed between the rev that Propolis uses and the different one in Omicron's Cargo.toml. writing up an issue before I fix that here)

@iximeow
Copy link
Member Author

iximeow commented Oct 14, 2025

@iximeow
Copy link
Member Author

iximeow commented Oct 14, 2025

this last rerun was:

thread 'integration_tests::crucible_replacements::test_delete_volume_region_replacement_state_replacement_done' panicked at nexus/tests/integration_tests/crucible_replacements.rs:486:14:
request transitioned to expected state: TimedOut(260.002921832s)

which had passed in the run before so it's quite clearly a flake. looking into it while build-and-test (helios) reruns though..

@iximeow iximeow merged commit a3bf7ea into main Oct 18, 2025
18 checks passed
@iximeow iximeow deleted the ixi/bump-propolis-crucible branch October 18, 2025 00:38
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