Skip to content

Commit bb26b0a

Browse files
leftwoAlan Hanson
and
Alan Hanson
authored
New crucible and propolis (#5374)
Crucible Increase max backpressure again (Crucible issue #1243) Bump backpressure delay for byte-based backpressure (Crucible issue #1240) `crutest` cleaning; adding rand-read/write tests (Crucible issue #1233) Propolis changes, just the above crucible bits. Co-authored-by: Alan Hanson <[email protected]>
1 parent ac11458 commit bb26b0a

File tree

3 files changed

+25
-25
lines changed

3 files changed

+25
-25
lines changed

Cargo.lock

+13-13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ cookie = "0.18"
197197
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
198198
crossbeam = "0.8"
199199
crossterm = { version = "0.27.0", features = ["event-stream"] }
200-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "09bcfa6b9201f75891a5413928bb088cc150d319" }
201-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "09bcfa6b9201f75891a5413928bb088cc150d319" }
202-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "09bcfa6b9201f75891a5413928bb088cc150d319" }
200+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "4661c23b248da18862012cf55af21b17b79a468e" }
201+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "4661c23b248da18862012cf55af21b17b79a468e" }
202+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "4661c23b248da18862012cf55af21b17b79a468e" }
203203
csv = "1.3.0"
204204
curve25519-dalek = "4"
205205
datatest-stable = "0.2.3"
@@ -339,9 +339,9 @@ prettyplease = { version = "0.2.16", features = ["verbatim"] }
339339
proc-macro2 = "1.0"
340340
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
341341
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
342-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "9b2deee64874b315427962b1c7fccceef99436b2" }
343-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "9b2deee64874b315427962b1c7fccceef99436b2" }
344-
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "9b2deee64874b315427962b1c7fccceef99436b2" }
342+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "84e423bfd3bf84ebb04acb95cf7600731e9f361f" }
343+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "84e423bfd3bf84ebb04acb95cf7600731e9f361f" }
344+
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "84e423bfd3bf84ebb04acb95cf7600731e9f361f" }
345345
proptest = "1.4.0"
346346
quote = "1.0"
347347
rand = "0.8.5"

package-manifest.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,10 @@ only_for_targets.image = "standard"
492492
# 3. Use source.type = "manual" instead of "prebuilt"
493493
source.type = "prebuilt"
494494
source.repo = "crucible"
495-
source.commit = "09bcfa6b9201f75891a5413928bb088cc150d319"
495+
source.commit = "4661c23b248da18862012cf55af21b17b79a468e"
496496
# The SHA256 digest is automatically posted to:
497497
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
498-
source.sha256 = "32a0cc78b436679ed9966564e5a7c0214d67f56c4a5fbac0a5b9507d99752b15"
498+
source.sha256 = "14e607d04234a6749e981c8049437523dbc75494938541822e31ea61090800bf"
499499
output.type = "zone"
500500
output.intermediate_only = true
501501

@@ -504,10 +504,10 @@ service_name = "crucible_pantry_prebuilt"
504504
only_for_targets.image = "standard"
505505
source.type = "prebuilt"
506506
source.repo = "crucible"
507-
source.commit = "09bcfa6b9201f75891a5413928bb088cc150d319"
507+
source.commit = "4661c23b248da18862012cf55af21b17b79a468e"
508508
# The SHA256 digest is automatically posted to:
509509
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
510-
source.sha256 = "99028aaac8c879e4855296ce0bde826ceb8f73504fadf0ded7674dcf45fb0446"
510+
source.sha256 = "9a2181b43d7581468d075e37b5286e478ff008de65dd73b7f49a6e72bc9a43f5"
511511
output.type = "zone"
512512
output.intermediate_only = true
513513

@@ -519,10 +519,10 @@ service_name = "propolis-server"
519519
only_for_targets.image = "standard"
520520
source.type = "prebuilt"
521521
source.repo = "propolis"
522-
source.commit = "9b2deee64874b315427962b1c7fccceef99436b2"
522+
source.commit = "84e423bfd3bf84ebb04acb95cf7600731e9f361f"
523523
# The SHA256 digest is automatically posted to:
524524
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
525-
source.sha256 = "b32be7167e0c10ebad874de011a752edcbf936cf55abdaddef7f40025beb9b6a"
525+
source.sha256 = "db72c83b4c0a09e0759ec52e48a5589e9d732c3f390fb4c084f820d173b4f058"
526526
output.type = "zone"
527527

528528
[package.mg-ddm-gz]

0 commit comments

Comments
 (0)