Skip to content

Commit

Permalink
Update Crucible and Propolis to latest
Browse files Browse the repository at this point in the history 
Crucible:
Add quota to agent created datasets (#835)
Switch to building on heliosv2 (#830)
Minor clippy cleanup (#832)
Update to latest dropshot (#829)

Propolis:
The above crucible changes
Switch to building on heliosv2 (#461)
clean up cargo check/clippy errors when built with Rust 1.71 (#462)
Add some VMM_DESTROY_VM polish to bhyve-api
  • Loading branch information
Alan Hanson committed Jul 15, 2023
1 parent 76d51d8 commit 83932a0
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 41 deletions.
44 changes: 16 additions & 28 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 8 additions & 7 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,10 +151,10 @@ cookie = "0.16"
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
crossbeam = "0.8"
crossterm = { version = "0.26.1", features = ["event-stream"] }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "c574ff1232aa66eb60069795fe45f0c47f5da51d" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
crucible-client-types = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "179e68b8718d24673893dac46a8ab4a9249ec318" }
curve25519-dalek = "3"
datatest-stable = "0.1.3"
display-error-chain = "0.1.1"
Expand Down Expand Up @@ -264,9 +264,9 @@ pretty-hex = "0.3.0"
proc-macro2 = "1.0"
progenitor = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
progenitor-client = { git = "https://github.com/oxidecomputer/progenitor", branch = "main" }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "9e12522341048d7b8c38394f0ddeb18083685c2f" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "9e12522341048d7b8c38394f0ddeb18083685c2f", features = [ "generated-migration" ] }
propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "9e12522341048d7b8c38394f0ddeb18083685c2f", default-features = false, features = ["mock-only"] }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "eeb63abee5a84da54bebed061a87fafbd66c1f12" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "eeb63abee5a84da54bebed061a87fafbd66c1f12", features = [ "generated-migration" ] }
propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "eeb63abee5a84da54bebed061a87fafbd66c1f12", default-features = false, features = ["mock-only"] }
#propolis-server = { path = "../propolis/bin/propolis-server" }
proptest = "1.2.0"
quote = "1.0"
Expand Down Expand Up @@ -515,6 +515,7 @@ opt-level = 3
#crucible-agent-client = { path = "../crucible/agent-client" }
#crucible-client-types = { path = "../crucible/crucible-client-types" }
#crucible-pantry-client = { path = "../crucible/pantry-client" }
#crucible-smf = { path = "../crucible/smf" }

#
# Local client generation during development.
Expand Down
12 changes: 6 additions & 6 deletions package-manifest.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,21 +242,21 @@ only_for_targets.image = "standard"
# 3. Use source.type = "manual" instead of "prebuilt"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "c574ff1232aa66eb60069795fe45f0c47f5da51d"
source.commit = "179e68b8718d24673893dac46a8ab4a9249ec318"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
source.sha256 = "72363fbbfde15689bdbafee53e415ca994903644a9fdbb33ca0bc72d65927f0f"
source.sha256 = "92d83450a48c3bca7775a8b00b453dfb48d1c6a3519bc1a4a75c9f9c46543e8f"
output.type = "zone"

[package.crucible-pantry]
service_name = "crucible_pantry"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "c574ff1232aa66eb60069795fe45f0c47f5da51d"
source.commit = "179e68b8718d24673893dac46a8ab4a9249ec318"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
source.sha256 = "4645454e3af72ee68bc3916042f78deaac44a8c07bb6c1a1e5766b83f5326e07"
source.sha256 = "88d86e90f1c0e45eb371b57ecf05f15ac869d642adf343b76217bb2cdb7a928d"
output.type = "zone"

# Refer to
Expand All @@ -267,10 +267,10 @@ service_name = "propolis-server"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "propolis"
source.commit = "9e12522341048d7b8c38394f0ddeb18083685c2f"
source.commit = "eeb63abee5a84da54bebed061a87fafbd66c1f12"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
source.sha256 = "084df2cf5866a17b5467dccdaddef5088cc021a1ee0eb3bea99472bcf67ea7fa"
source.sha256 = "866be7208bfd4a235d1babd28e346bbc0164d5922bdc108ded32841ac8cbfe27"
output.type = "zone"

[package.maghemite]
Expand Down

0 comments on commit 83932a0

Please sign in to comment.