Skip to content

Commit 962ac94

Browse files
author
Alan Hanson
committed
Update Crucible to latest
No Propolis changes other than to update Crucible Crucible changes are: Add debug/timeout to test_memory.sh (#1563) Consolidate ack checking (#1561) Rename for crutest: RegionInfo -> DiskInfo (#1562) Fix dtrace system level scripts (#1560) Remove `ackable_work`; ack immediately instead (#1552) No more New jobs, no more New jobs column (#1559) Remove delay-based backpressure in favor of explicit queue limits (#1515) Only send flushes when Downstairs is idle; send Barrier otherwise (#1505) Update Rust crate reqwest to v0.12.9 (#1536) Update Rust crate omicron-zone-package to 0.11.1 (#1535) Remove separate validation array (#1522) Remove more unnecessary `DsState` variants (#1550) Consolidate `DownstairsClient::reinitialize` (#1549) Update Rust crate uuid to v1.11.0 (#1546) Update Rust crate reedline to 0.36.0 (#1544) Update Rust crate bytes to v1.8.0 (#1541) Update Rust crate thiserror to v1.0.66 (#1539) Update Rust crate serde_json to v1.0.132 (#1538) Update Rust crate serde to v1.0.214 (#1537) Remove transient states in `DsState` (#1526) Update Rust crate libc to v0.2.161 (#1534) Update Rust crate futures to v0.3.31 (#1532) Update Rust crate clap to v4.5.20 (#1531) Update Rust crate async-trait to 0.1.83 (#1530) Update Rust crate anyhow to v1.0.92 (#1529) Remove obsolete crutest perf test (#1528) Update dependency rust to v1.82.0 (#1512) Still more updates to support Volume layer activities. (#1508) Remove remaining IOPS/bandwidth limiting code (#1525) Add unit test for VersionMismatch (#1524) Removing panic paths by only destructuring once (#1523) Update actions/checkout digest to 11bd719 (#1518) Switch to using `Duration` for times (#1520)
1 parent 574b697 commit 962ac94

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -532,10 +532,10 @@ prettyplease = { version = "0.2.25", features = ["verbatim"] }
532532
proc-macro2 = "1.0"
533533
progenitor = "0.8.0"
534534
progenitor-client = "0.8.0"
535-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "aadc0998c0f07f08ab15a95c006074291734800f" }
536-
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "aadc0998c0f07f08ab15a95c006074291734800f" }
537-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "aadc0998c0f07f08ab15a95c006074291734800f" }
538-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "aadc0998c0f07f08ab15a95c006074291734800f" }
535+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "8f8fbb74662b4e19b643c500d55d2d384a6cee5e" }
536+
propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "8f8fbb74662b4e19b643c500d55d2d384a6cee5e" }
537+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "8f8fbb74662b4e19b643c500d55d2d384a6cee5e" }
538+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "8f8fbb74662b4e19b643c500d55d2d384a6cee5e" }
539539
proptest = "1.5.0"
540540
qorb = "0.2.0"
541541
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 = "b7b9d5660b28ca5e865242b2bdecd032c0852d40"
581+
source.commit = "1d82cc9fd9925814d097d39f7cbafd62fb8cfb7e"
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 = "44e623730765f8fc0b702d107939552514530a33b306ca5e8bc8276ff0aaf79a"
584+
source.sha256 = "c66b3f7ef87e17533a3bbf7d0c0c6f01adab031f9acf173399b4a3dda32d097b"
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 = "b7b9d5660b28ca5e865242b2bdecd032c0852d40"
593+
source.commit = "1d82cc9fd9925814d097d39f7cbafd62fb8cfb7e"
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 = "bc0a41d349646ec2111bff346db2c300001d646a99f33b05b39b78188e34ae41"
596+
source.sha256 = "144d9a5846b1fddffbe1fc8c30db44b06934feb6bc726f26ceade43bfc38c2a0"
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 = "b7b9d5660b28ca5e865242b2bdecd032c0852d40"
610+
source.commit = "1d82cc9fd9925814d097d39f7cbafd62fb8cfb7e"
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 = "64e37f7a062f7c8941fac3b95a81d98475e5c02ff01111554b0ddb7fc232f40f"
613+
source.sha256 = "f6e304172b4a7af1dbd70d2506889e9364f61c488ff346f525256b3ce1e80eff"
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 = "aadc0998c0f07f08ab15a95c006074291734800f"
624+
source.commit = "8f8fbb74662b4e19b643c500d55d2d384a6cee5e"
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 = "3cd889201aaa8cc5b916fc8f8176ab5529e2fc1d5d57165ad9a660eb48affef9"
627+
source.sha256 = "5dc0c116d2463d17a64a91941bc3e664746ce0c4b7cf54c73ae72e410fba0757"
628628
output.type = "zone"
629629

630630
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)