Skip to content

Commit 165d42a

Browse files
authored
Update Crucible and Propolis (#6453)
Co-authored-by: Benjamin Naecker <[email protected]>
1 parent eb54c1c commit 165d42a

File tree

3 files changed

+29
-29
lines changed

3 files changed

+29
-29
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -323,10 +323,10 @@ cookie = "0.18"
323323
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
324324
crossbeam = "0.8"
325325
crossterm = { version = "0.28.1", features = ["event-stream"] }
326-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"}
327-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"}
328-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"}
329-
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"}
326+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"}
327+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"}
328+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"}
329+
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"}
330330
csv = "1.3.0"
331331
curve25519-dalek = "4"
332332
datatest-stable = "0.2.9"
@@ -503,8 +503,8 @@ proc-macro2 = "1.0"
503503
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
504504
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
505505
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
506-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "d45b4898137762074b7f7435b64fd2ccf41f4138" }
507-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "d45b4898137762074b7f7435b64fd2ccf41f4138" }
506+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "5267be82e10d851a64196a8148893691b0b9f8ad" }
507+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "5267be82e10d851a64196a8148893691b0b9f8ad" }
508508
proptest = "1.5.0"
509509
qorb = { git = "https://github.com/oxidecomputer/qorb", branch = "master" }
510510
quote = "1.0"

package-manifest.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -569,10 +569,10 @@ only_for_targets.image = "standard"
569569
# 3. Use source.type = "manual" instead of "prebuilt"
570570
source.type = "prebuilt"
571571
source.repo = "crucible"
572-
source.commit = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"
572+
source.commit = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"
573573
# The SHA256 digest is automatically posted to:
574574
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
575-
source.sha256 = "fbc1482e41c92120cc79611fe7774752f1ed2ecef17a8adcd00ab4099f08821f"
575+
source.sha256 = "9a77eda6314efd1780ff2ee25c28c6401f3e7f2592bf73b09993cee8ac863168"
576576
output.type = "zone"
577577
output.intermediate_only = true
578578

@@ -581,10 +581,10 @@ service_name = "crucible_pantry_prebuilt"
581581
only_for_targets.image = "standard"
582582
source.type = "prebuilt"
583583
source.repo = "crucible"
584-
source.commit = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"
584+
source.commit = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"
585585
# The SHA256 digest is automatically posted to:
586586
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
587-
source.sha256 = "7c7ea8cd3895687e3bdae2eef6dce57f11c937ce0c52bd6779c897cb6462d387"
587+
source.sha256 = "84f3bc041aedfcbf2162a6dd022446c3af707acd91b1c4e98c8cd45f469d5ce2"
588588
output.type = "zone"
589589
output.intermediate_only = true
590590

@@ -598,10 +598,10 @@ service_name = "crucible_dtrace"
598598
only_for_targets.image = "standard"
599599
source.type = "prebuilt"
600600
source.repo = "crucible"
601-
source.commit = "eab46702b6a43ff558672462dea3eb5ff7b8a0e6"
601+
source.commit = "b026dd82779eb2c2f87164e30feb7dd7f4b6e677"
602602
# The SHA256 digest is automatically posted to:
603603
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-dtrace.sha256.txt
604-
source.sha256 = "983a6b8a0add7dc19c8dde1e0675a5fe160dc92b25cae5817d4664a7a1aff18f"
604+
source.sha256 = "bdec4bc5a15d417c1e203f547c798c03442f5be753cd0361f6e6a939630ad1c3"
605605
output.type = "tarball"
606606

607607
# Refer to
@@ -612,10 +612,10 @@ service_name = "propolis-server"
612612
only_for_targets.image = "standard"
613613
source.type = "prebuilt"
614614
source.repo = "propolis"
615-
source.commit = "d45b4898137762074b7f7435b64fd2ccf41f4138"
615+
source.commit = "5267be82e10d851a64196a8148893691b0b9f8ad"
616616
# The SHA256 digest is automatically posted to:
617617
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
618-
source.sha256 = "123b16bed8269c9fec93f462e8284567b86f42230401c7dec8fe68c63a811950"
618+
source.sha256 = "e16c961b60d3946cce2052622eac053aea683b2f47f7dc25e07286d83b1907a9"
619619
output.type = "zone"
620620

621621
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)