Skip to content

Commit a3bf7ea

Browse files
authored
Bump Propolis and Crucible (#9204)
Propolis changes: * oxidecomputer/propolis#950 * oxidecomputer/propolis#952 * oxidecomputer/propolis#951 * oxidecomputer/propolis#954 * oxidecomputer/propolis#957 * oxidecomputer/propolis#960 * oxidecomputer/propolis#961 * oxidecomputer/propolis#955 Crucible changes: * oxidecomputer/crucible#1773 * oxidecomputer/crucible#1774 * oxidecomputer/crucible#1780 * oxidecomputer/crucible#1778 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](https://github.com/oxidecomputer/omicron/blob/d74f5e3f1ae0a378dcdb9795a0ada2426702b046/nexus/src/app/instance_platform/cpu_platform.rs#L423). 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.
1 parent a15e4d3 commit a3bf7ea

File tree

3 files changed

+31
-31
lines changed

3 files changed

+31
-31
lines changed

Cargo.lock

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -413,10 +413,10 @@ crossterm = { version = "0.29.0", features = ["event-stream"] }
413413
# NOTE: if you change the pinned revision of the `crucible` dependencies, you
414414
# must also update the references in package-manifest.toml to match the new
415415
# revision.
416-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" }
417-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" }
418-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" }
419-
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" }
416+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "102b0bb8305cfbc3fa74c52d643d716653756372" }
417+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "102b0bb8305cfbc3fa74c52d643d716653756372" }
418+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "102b0bb8305cfbc3fa74c52d643d716653756372" }
419+
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "102b0bb8305cfbc3fa74c52d643d716653756372" }
420420
# NOTE: See above!
421421
csv = "1.3.1"
422422
curve25519-dalek = "4"
@@ -644,10 +644,10 @@ progenitor-client = "0.10.0"
644644
# NOTE: if you change the pinned revision of the `bhyve_api` and propolis
645645
# dependencies, you must also update the references in package-manifest.toml to
646646
# match the new revision.
647-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" }
648-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" }
649-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" }
650-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" }
647+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "8e9252917993e36d43dce96b4409ef151b7d4442" }
648+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "8e9252917993e36d43dce96b4409ef151b7d4442" }
649+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "8e9252917993e36d43dce96b4409ef151b7d4442" }
650+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "8e9252917993e36d43dce96b4409ef151b7d4442" }
651651
# NOTE: see above!
652652
proptest = "1.7.0"
653653
qorb = "0.4.1"

package-manifest.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -595,10 +595,10 @@ only_for_targets.image = "standard"
595595
# 3. Use source.type = "manual" instead of "prebuilt"
596596
source.type = "prebuilt"
597597
source.repo = "crucible"
598-
source.commit = "65ca41e821ef53ec9c28909357f23e3348169e4f"
598+
source.commit = "102b0bb8305cfbc3fa74c52d643d716653756372"
599599
# The SHA256 digest is automatically posted to:
600600
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
601-
source.sha256 = "7a19eda420ebd1126a25746c2198ed58a62647c755a375c746e84351e651b278"
601+
source.sha256 = "5edb5f8b85002115bdf81bcfbbf3bb233b8ee560e1d315a8e2b9989ec9dc43fc"
602602
output.type = "zone"
603603
output.intermediate_only = true
604604

@@ -607,10 +607,10 @@ service_name = "crucible_pantry_prebuilt"
607607
only_for_targets.image = "standard"
608608
source.type = "prebuilt"
609609
source.repo = "crucible"
610-
source.commit = "65ca41e821ef53ec9c28909357f23e3348169e4f"
610+
source.commit = "102b0bb8305cfbc3fa74c52d643d716653756372"
611611
# The SHA256 digest is automatically posted to:
612612
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
613-
source.sha256 = "e5dcf53aac3ddb5060663d2950837b3c4c81c68ede23b4ff5b1778cd1d4fb51e"
613+
source.sha256 = "d0ec6e365cf9e918d7aa4711dc48b4eec9362b37d5becfa3133895dff801ceca"
614614
output.type = "zone"
615615
output.intermediate_only = true
616616

@@ -624,10 +624,10 @@ service_name = "crucible_dtrace"
624624
only_for_targets.image = "standard"
625625
source.type = "prebuilt"
626626
source.repo = "crucible"
627-
source.commit = "65ca41e821ef53ec9c28909357f23e3348169e4f"
627+
source.commit = "102b0bb8305cfbc3fa74c52d643d716653756372"
628628
# The SHA256 digest is automatically posted to:
629629
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-dtrace.sha256.txt
630-
source.sha256 = "4ec3f612b0c10ef3372e22e99ef8170ab39d198f394b0e51d6c1065dc7d01b40"
630+
source.sha256 = "580fc58e717e245ea8a8171e25d7765edf58d57d3d9d190cdf61a4a1cae474be"
631631
output.type = "tarball"
632632

633633
# Refer to
@@ -638,10 +638,10 @@ service_name = "propolis-server"
638638
only_for_targets.image = "standard"
639639
source.type = "prebuilt"
640640
source.repo = "propolis"
641-
source.commit = "827e6615bfebfd94d41504dcd1517a0f22e3166a"
641+
source.commit = "8e9252917993e36d43dce96b4409ef151b7d4442"
642642
# The SHA256 digest is automatically posted to:
643643
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
644-
source.sha256 = "242ecfab2c992a4587d19c19a1ad36338305a15af418233dcde231c614ccc2bc"
644+
source.sha256 = "1fd3dbec9d7ba89a8805e0c759c770d2b90a4c35a677dca43171ba866d6675bf"
645645
output.type = "zone"
646646

647647
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)