Skip to content

Commit 564e9b8

Browse files
leftwoAlan Hanson
andauthored
Crucible and Propolis update (#7201)
Crucible: Skip jobs when reinitializing to `Faulted` (#1583) Clear `repair_check_deadline` if repair is successfully started (#1581) Update rust-version reqs to reflect reality (#1580) Propolis: Update nvme-trace.d to match current probe definitions (#821) Fix clippy lints for Rust 1.83 PHD: use stty to widen the effective terminal for Linux guests (#818) Co-authored-by: Alan Hanson <[email protected]>
1 parent 464f06c commit 564e9b8

File tree

3 files changed

+30
-30
lines changed

3 files changed

+30
-30
lines changed

Cargo.lock

Lines changed: 14 additions & 14 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
@@ -346,10 +346,10 @@ cookie = "0.18"
346346
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
347347
crossbeam = "0.8"
348348
crossterm = { version = "0.28.1", features = ["event-stream"] }
349-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "2cfc7e0c8572b3bfafbfc838c4e6d658f442d239" }
350-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "2cfc7e0c8572b3bfafbfc838c4e6d658f442d239" }
351-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "2cfc7e0c8572b3bfafbfc838c4e6d658f442d239" }
352-
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "2cfc7e0c8572b3bfafbfc838c4e6d658f442d239" }
349+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "5a41b826171c7d2a8412fa833377ab1df25ee8ec" }
350+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "5a41b826171c7d2a8412fa833377ab1df25ee8ec" }
351+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "5a41b826171c7d2a8412fa833377ab1df25ee8ec" }
352+
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "5a41b826171c7d2a8412fa833377ab1df25ee8ec" }
353353
csv = "1.3.0"
354354
curve25519-dalek = "4"
355355
datatest-stable = "0.2.9"
@@ -539,10 +539,10 @@ prettyplease = { version = "0.2.25", features = ["verbatim"] }
539539
proc-macro2 = "1.0"
540540
progenitor = "0.8.0"
541541
progenitor-client = "0.8.0"
542-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "6936f1a949d155da38d3148abd42caef337dea04" }
543-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "6936f1a949d155da38d3148abd42caef337dea04" }
544-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "6936f1a949d155da38d3148abd42caef337dea04" }
545-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "6936f1a949d155da38d3148abd42caef337dea04" }
542+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "19a421dceac7756aef26a8771f258af9cc21fc37" }
543+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "19a421dceac7756aef26a8771f258af9cc21fc37" }
544+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "19a421dceac7756aef26a8771f258af9cc21fc37" }
545+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "19a421dceac7756aef26a8771f258af9cc21fc37" }
546546
proptest = "1.5.0"
547547
qorb = "0.2.1"
548548
quote = "1.0"

package-manifest.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -578,10 +578,10 @@ only_for_targets.image = "standard"
578578
# 3. Use source.type = "manual" instead of "prebuilt"
579579
source.type = "prebuilt"
580580
source.repo = "crucible"
581-
source.commit = "2cfc7e0c8572b3bfafbfc838c4e6d658f442d239"
581+
source.commit = "5a41b826171c7d2a8412fa833377ab1df25ee8ec"
582582
# The SHA256 digest is automatically posted to:
583583
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
584-
source.sha256 = "0276c1513b33c61c866eb31756879e9d079534f43af90b01c0a2dd152c6ce18d"
584+
source.sha256 = "bcccfb03a68e46bb958410faf6f619e25f5ec9ccc65c503aeb87bb7ad456e517"
585585
output.type = "zone"
586586
output.intermediate_only = true
587587

@@ -590,10 +590,10 @@ service_name = "crucible_pantry_prebuilt"
590590
only_for_targets.image = "standard"
591591
source.type = "prebuilt"
592592
source.repo = "crucible"
593-
source.commit = "2cfc7e0c8572b3bfafbfc838c4e6d658f442d239"
593+
source.commit = "5a41b826171c7d2a8412fa833377ab1df25ee8ec"
594594
# The SHA256 digest is automatically posted to:
595595
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
596-
source.sha256 = "7ad4f84df681f5ccd90bd74473a17a0e1310f562bfd0c08047aad6adbd131903"
596+
source.sha256 = "96326422f79413fe31bb1c7df6173b2991b463cabc5b1fb4182db703500c8882"
597597
output.type = "zone"
598598
output.intermediate_only = true
599599

@@ -607,10 +607,10 @@ service_name = "crucible_dtrace"
607607
only_for_targets.image = "standard"
608608
source.type = "prebuilt"
609609
source.repo = "crucible"
610-
source.commit = "2cfc7e0c8572b3bfafbfc838c4e6d658f442d239"
610+
source.commit = "5a41b826171c7d2a8412fa833377ab1df25ee8ec"
611611
# The SHA256 digest is automatically posted to:
612612
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-dtrace.sha256.txt
613-
source.sha256 = "dac88622ecf6e3529b9d83390607c921723eca26de68b0801efd66c36acfa629"
613+
source.sha256 = "d35ed81a1e58ec66b621938f4b57513c1a3eb0b66e21834e000e0ace9624b462"
614614
output.type = "tarball"
615615

616616
# Refer to
@@ -621,10 +621,10 @@ service_name = "propolis-server"
621621
only_for_targets.image = "standard"
622622
source.type = "prebuilt"
623623
source.repo = "propolis"
624-
source.commit = "6936f1a949d155da38d3148abd42caef337dea04"
624+
source.commit = "19a421dceac7756aef26a8771f258af9cc21fc37"
625625
# The SHA256 digest is automatically posted to:
626626
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
627-
source.sha256 = "a3a45292bd45938a785b84afee39f690a5f05d1920b78b8fc0512a131857d7ee"
627+
source.sha256 = "fbb52fed6312db047a7f56d43162e5d4c5072886a23b5e6a0096f6db78c5d2ba"
628628
output.type = "zone"
629629

630630
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)