Skip to content

Commit e372b92

Browse files
author
Alan Hanson
committed
Update Crucible and Propolis
Propolis changes: PHD: refactor & add support Propolis server "environments" (#547) Begin making Accessor interface more robust Update Crucible and Omicron deps for Hakari fixes Add cloud-init volume generation to standalone Use specified toolchain version for all GHA checks Use params to configure rust-toolchain in GHA Update and lock GHA dependencies Crucible changes: Use regions_dataset path for apply_smf (#1000) Don't unwrap when we can't create a dataset (#992) Fix tests and update log messages. (#995) Better backpressure (#990) Update Rust crate proptest to 1.3.1 (#977) Read only downstairs can skip Live Repair (#984) Update Rust crate expectorate to 1.1.0 (#975) Add trait for `ExtentInner` (#982) report backpressure in upstairs_info dtrace probe (#987) Support multiple downstairs operations in GtoS (#985)
1 parent 43a9965 commit e372b92

File tree

3 files changed

+44
-93
lines changed

3 files changed

+44
-93
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ cookie = "0.16"
163163
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
164164
crossbeam = "0.8"
165165
crossterm = { version = "0.27.0", features = ["event-stream"] }
166-
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "20273bcca1fd5834ebc3e67dfa7020f0e99ad681" }
167-
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "20273bcca1fd5834ebc3e67dfa7020f0e99ad681" }
168-
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "20273bcca1fd5834ebc3e67dfa7020f0e99ad681" }
169-
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "20273bcca1fd5834ebc3e67dfa7020f0e99ad681" }
166+
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "657d985247b41e38aac2e271c7ce8bc9ea81f4b6" }
167+
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "657d985247b41e38aac2e271c7ce8bc9ea81f4b6" }
168+
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "657d985247b41e38aac2e271c7ce8bc9ea81f4b6" }
169+
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "657d985247b41e38aac2e271c7ce8bc9ea81f4b6" }
170170
curve25519-dalek = "4"
171171
datatest-stable = "0.1.3"
172172
display-error-chain = "0.1.1"
@@ -281,9 +281,9 @@ pretty-hex = "0.3.0"
281281
proc-macro2 = "1.0"
282282
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
283283
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
284-
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "901b710b6e5bd05a94a323693c2b971e7e7b240e" }
285-
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "901b710b6e5bd05a94a323693c2b971e7e7b240e", features = [ "generated-migration" ] }
286-
propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "901b710b6e5bd05a94a323693c2b971e7e7b240e", default-features = false, features = ["mock-only"] }
284+
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "334df299a56cd0d33e1227ed4ce4d2fe7478d541" }
285+
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "334df299a56cd0d33e1227ed4ce4d2fe7478d541", features = [ "generated-migration" ] }
286+
propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "334df299a56cd0d33e1227ed4ce4d2fe7478d541", default-features = false, features = ["mock-only"] }
287287
proptest = "1.3.1"
288288
quote = "1.0"
289289
rand = "0.8.5"

package-manifest.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -381,21 +381,21 @@ only_for_targets.image = "standard"
381381
# 3. Use source.type = "manual" instead of "prebuilt"
382382
source.type = "prebuilt"
383383
source.repo = "crucible"
384-
source.commit = "20273bcca1fd5834ebc3e67dfa7020f0e99ad681"
384+
source.commit = "657d985247b41e38aac2e271c7ce8bc9ea81f4b6"
385385
# The SHA256 digest is automatically posted to:
386386
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
387-
source.sha256 = "0671570dfed8bff8e64c42a41269d961426bdd07e72b9ca8c2e3f28e7ead3c1c"
387+
source.sha256 = "010281ff5c3a0807c9e770d79264c954816a055aa482988d81e85ed98242e454"
388388
output.type = "zone"
389389

390390
[package.crucible-pantry]
391391
service_name = "crucible_pantry"
392392
only_for_targets.image = "standard"
393393
source.type = "prebuilt"
394394
source.repo = "crucible"
395-
source.commit = "20273bcca1fd5834ebc3e67dfa7020f0e99ad681"
395+
source.commit = "657d985247b41e38aac2e271c7ce8bc9ea81f4b6"
396396
# The SHA256 digest is automatically posted to:
397397
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
398-
source.sha256 = "c35cc24945d047f8d77e438ee606e6a83be64f0f97356fdc3308be716dcf3718"
398+
source.sha256 = "809936edff2957e761e49667d5477e34b7a862050b4e082a59fdc95096d3bdd5"
399399
output.type = "zone"
400400

401401
# Refer to
@@ -406,10 +406,10 @@ service_name = "propolis-server"
406406
only_for_targets.image = "standard"
407407
source.type = "prebuilt"
408408
source.repo = "propolis"
409-
source.commit = "901b710b6e5bd05a94a323693c2b971e7e7b240e"
409+
source.commit = "334df299a56cd0d33e1227ed4ce4d2fe7478d541"
410410
# The SHA256 digest is automatically posted to:
411411
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
412-
source.sha256 = "0f681cdbe7312f66fd3c99fe033b379e49c59fa4ad04d307f68b12514307e976"
412+
source.sha256 = "531e0654de94b6e805836c35aa88b8a1ac691184000a03976e2b7825061e904e"
413413
output.type = "zone"
414414

415415
[package.maghemite]

0 commit comments

Comments
 (0)