Skip to content

Commit

Permalink
Update Crucible and Propolis
Browse files Browse the repository at this point in the history
  • Loading branch information
bnaecker committed Aug 27, 2024
1 parent a0cdce7 commit 28f04ba
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 39 deletions.
66 changes: 42 additions & 24 deletions Cargo.lock

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

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -317,10 +317,10 @@ cookie = "0.18"
criterion = { version = "0.5.1", features = [ "async_tokio" ] }
crossbeam = "0.8"
crossterm = { version = "0.28.1", features = ["event-stream"] }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e58ca3693cb9ce0438947beba10e97ee38a0966b" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "e58ca3693cb9ce0438947beba10e97ee38a0966b" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "e58ca3693cb9ce0438947beba10e97ee38a0966b" }
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "e58ca3693cb9ce0438947beba10e97ee38a0966b" }
crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "d037eeb9a56a8a62ff17266f340c011224d15146" }
crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "d037eeb9a56a8a62ff17266f340c011224d15146" }
crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "d037eeb9a56a8a62ff17266f340c011224d15146" }
crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "d037eeb9a56a8a62ff17266f340c011224d15146" }
csv = "1.3.0"
curve25519-dalek = "4"
datatest-stable = "0.2.9"
Expand Down Expand Up @@ -493,9 +493,9 @@ prettyplease = { version = "0.2.20", features = ["verbatim"] }
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 = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9" }
bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "88fbde76311cd6862721e3e085fe0093c2cbe6d9" }
propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "88fbde76311cd6862721e3e085fe0093c2cbe6d9" }
propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "88fbde76311cd6862721e3e085fe0093c2cbe6d9" }
proptest = "1.5.0"
quote = "1.0"
rand = "0.8.5"
Expand Down
16 changes: 8 additions & 8 deletions package-manifest.toml
Original file line number Diff line number Diff line change
Expand Up @@ -569,10 +569,10 @@ only_for_targets.image = "standard"
# 3. Use source.type = "manual" instead of "prebuilt"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "e58ca3693cb9ce0438947beba10e97ee38a0966b"
source.commit = "d037eeb9a56a8a62ff17266f340c011224d15146"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible.sha256.txt
source.sha256 = "18dc942935af51ea03161498c44b56bb85b4a5d2499a5ff19ba87c0284e34742"
source.sha256 = "43a3f31b740c64255d2b5d087835a7888990702d6656832d89b6a9f8a2970ead"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -581,10 +581,10 @@ service_name = "crucible_pantry_prebuilt"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "e58ca3693cb9ce0438947beba10e97ee38a0966b"
source.commit = "d037eeb9a56a8a62ff17266f340c011224d15146"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-pantry.sha256.txt
source.sha256 = "9067426bb77ce091116a034a19abb96ecd98cc8ac228a147bd3c3283e40d527d"
source.sha256 = "ba22eab3ae5c2ef7536d10fc72f90807f4c12882f5cf648203b5b92482f77a52"
output.type = "zone"
output.intermediate_only = true

Expand All @@ -598,10 +598,10 @@ service_name = "crucible_dtrace"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "crucible"
source.commit = "e58ca3693cb9ce0438947beba10e97ee38a0966b"
source.commit = "d037eeb9a56a8a62ff17266f340c011224d15146"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image/<commit>/crucible-dtrace.sha256.txt
source.sha256 = "660e04fdcbacda66e5012ba4ba6cf1022a4d80453da165b1507d97b7386f2691"
source.sha256 = "c201a5df9de958147648eb08cd4f0368601a2e93d549c0fa456500b4919c5635"
output.type = "tarball"

# Refer to
Expand All @@ -612,10 +612,10 @@ service_name = "propolis-server"
only_for_targets.image = "standard"
source.type = "prebuilt"
source.repo = "propolis"
source.commit = "24a74d0c76b6a63961ecef76acb1516b6e66c5c9"
source.commit = "88fbde76311cd6862721e3e085fe0093c2cbe6d9"
# The SHA256 digest is automatically posted to:
# https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image/<commit>/propolis-server.sha256.txt
source.sha256 = "e716c1fa5c4ee402f8e3a63f667bbcda744f378305f91ff333bebafe5c20d60b"
source.sha256 = "5e903de2cb2304f45d42a52d9ce21bdaa5ed575e6fb71cd073daf5262c47302d"
output.type = "zone"

[package.mg-ddm-gz]
Expand Down

0 comments on commit 28f04ba

Please sign in to comment.