From 31c0aea5b92899fdaac46e0080b943d3d5531493 Mon Sep 17 00:00:00 2001 From: iximeow Date: Mon, 13 Oct 2025 18:32:03 +0000 Subject: [PATCH 1/2] Bump Propolis and Crucible Propolis changes: * oxidecomputer/propolis#950 * oxidecomputer/propolis#952 * oxidecomputer/propolis#951 * oxidecomputer/propolis#954 * oxidecomputer/propolis#957 * oxidecomputer/propolis#960 * oxidecomputer/propolis#961 * oxidecomputer/propolis#955 Crucible changes: * oxidecomputer/crucible#1773 * oxidecomputer/crucible#1774 * oxidecomputer/crucible#1780 * oxidecomputer/crucible#1778 --- Cargo.lock | 22 +++++++++++----------- Cargo.toml | 8 ++++---- package-manifest.toml | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6e56aa7c49..670489ac3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -686,7 +686,7 @@ dependencies = [ [[package]] name = "bhyve_api" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=827e6615bfebfd94d41504dcd1517a0f22e3166a#827e6615bfebfd94d41504dcd1517a0f22e3166a" +source = "git+https://github.com/oxidecomputer/propolis?rev=8e9252917993e36d43dce96b4409ef151b7d4442#8e9252917993e36d43dce96b4409ef151b7d4442" dependencies = [ "bhyve_api_sys", "libc", @@ -696,7 +696,7 @@ dependencies = [ [[package]] name = "bhyve_api_sys" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=827e6615bfebfd94d41504dcd1517a0f22e3166a#827e6615bfebfd94d41504dcd1517a0f22e3166a" +source = "git+https://github.com/oxidecomputer/propolis?rev=8e9252917993e36d43dce96b4409ef151b7d4442#8e9252917993e36d43dce96b4409ef151b7d4442" dependencies = [ "libc", "strum 0.26.3", @@ -2069,7 +2069,7 @@ dependencies = [ [[package]] name = "crucible-client-types" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=65ca41e821ef53ec9c28909357f23e3348169e4f#65ca41e821ef53ec9c28909357f23e3348169e4f" +source = "git+https://github.com/oxidecomputer/crucible?rev=102b0bb8305cfbc3fa74c52d643d716653756372#102b0bb8305cfbc3fa74c52d643d716653756372" dependencies = [ "base64 0.22.1", "crucible-workspace-hack", @@ -8184,7 +8184,7 @@ dependencies = [ "pq-sys", "pretty_assertions", "progenitor-client 0.10.0", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=827e6615bfebfd94d41504dcd1517a0f22e3166a)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=8e9252917993e36d43dce96b4409ef151b7d4442)", "qorb", "rand 0.9.2", "range-requests", @@ -8612,7 +8612,7 @@ dependencies = [ "oximeter-producer", "oxnet", "pretty_assertions", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=827e6615bfebfd94d41504dcd1517a0f22e3166a)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=8e9252917993e36d43dce96b4409ef151b7d4442)", "propolis-mock-server", "propolis_api_types", "rand 0.9.2", @@ -10632,7 +10632,7 @@ dependencies = [ [[package]] name = "propolis-client" version = "0.1.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=827e6615bfebfd94d41504dcd1517a0f22e3166a#827e6615bfebfd94d41504dcd1517a0f22e3166a" +source = "git+https://github.com/oxidecomputer/propolis?rev=8e9252917993e36d43dce96b4409ef151b7d4442#8e9252917993e36d43dce96b4409ef151b7d4442" dependencies = [ "async-trait", "base64 0.21.7", @@ -10677,7 +10677,7 @@ dependencies = [ [[package]] name = "propolis-mock-server" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=827e6615bfebfd94d41504dcd1517a0f22e3166a#827e6615bfebfd94d41504dcd1517a0f22e3166a" +source = "git+https://github.com/oxidecomputer/propolis?rev=8e9252917993e36d43dce96b4409ef151b7d4442#8e9252917993e36d43dce96b4409ef151b7d4442" dependencies = [ "anyhow", "atty", @@ -10721,7 +10721,7 @@ dependencies = [ [[package]] name = "propolis_api_types" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=827e6615bfebfd94d41504dcd1517a0f22e3166a#827e6615bfebfd94d41504dcd1517a0f22e3166a" +source = "git+https://github.com/oxidecomputer/propolis?rev=8e9252917993e36d43dce96b4409ef151b7d4442#8e9252917993e36d43dce96b4409ef151b7d4442" dependencies = [ "crucible-client-types", "propolis_types", @@ -10734,7 +10734,7 @@ dependencies = [ [[package]] name = "propolis_types" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/propolis?rev=827e6615bfebfd94d41504dcd1517a0f22e3166a#827e6615bfebfd94d41504dcd1517a0f22e3166a" +source = "git+https://github.com/oxidecomputer/propolis?rev=8e9252917993e36d43dce96b4409ef151b7d4442#8e9252917993e36d43dce96b4409ef151b7d4442" dependencies = [ "schemars", "serde", @@ -12569,7 +12569,7 @@ dependencies = [ "omicron-workspace-hack", "oxnet", "progenitor 0.10.0", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=827e6615bfebfd94d41504dcd1517a0f22e3166a)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=8e9252917993e36d43dce96b4409ef151b7d4442)", "regress", "reqwest", "schemars", @@ -12648,7 +12648,7 @@ dependencies = [ "omicron-uuid-kinds", "omicron-workspace-hack", "oxnet", - "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=827e6615bfebfd94d41504dcd1517a0f22e3166a)", + "propolis-client 0.1.0 (git+https://github.com/oxidecomputer/propolis?rev=8e9252917993e36d43dce96b4409ef151b7d4442)", "rcgen", "schemars", "serde", diff --git a/Cargo.toml b/Cargo.toml index 18bd54edcb..7585d0c391 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -642,10 +642,10 @@ progenitor-client = "0.10.0" # NOTE: if you change the pinned revision of the `bhyve_api` and propolis # dependencies, you must also update the references in package-manifest.toml to # match the new revision. -bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" } -propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" } -propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" } -propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "827e6615bfebfd94d41504dcd1517a0f22e3166a" } +bhyve_api = { git = "https://github.com/oxidecomputer/propolis", rev = "8e9252917993e36d43dce96b4409ef151b7d4442" } +propolis_api_types = { git = "https://github.com/oxidecomputer/propolis", rev = "8e9252917993e36d43dce96b4409ef151b7d4442" } +propolis-client = { git = "https://github.com/oxidecomputer/propolis", rev = "8e9252917993e36d43dce96b4409ef151b7d4442" } +propolis-mock-server = { git = "https://github.com/oxidecomputer/propolis", rev = "8e9252917993e36d43dce96b4409ef151b7d4442" } # NOTE: see above! proptest = "1.7.0" qorb = "0.4.1" diff --git a/package-manifest.toml b/package-manifest.toml index f4c21d4504..6d97caa407 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -638,10 +638,10 @@ service_name = "propolis-server" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "propolis" -source.commit = "827e6615bfebfd94d41504dcd1517a0f22e3166a" +source.commit = "8e9252917993e36d43dce96b4409ef151b7d4442" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/propolis/image//propolis-server.sha256.txt -source.sha256 = "242ecfab2c992a4587d19c19a1ad36338305a15af418233dcde231c614ccc2bc" +source.sha256 = "1fd3dbec9d7ba89a8805e0c759c770d2b90a4c35a677dca43171ba866d6675bf" output.type = "zone" [package.mg-ddm-gz] From 6e328ac74a8d5057eb2211cc5583369f2c46678c Mon Sep 17 00:00:00 2001 From: iximeow Date: Mon, 13 Oct 2025 23:04:50 +0000 Subject: [PATCH 2/2] actually bump Crucible in the Crucible bump PR.. --- Cargo.lock | 8 ++++---- Cargo.toml | 8 ++++---- package-manifest.toml | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 670489ac3a..d3e22e6faa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2053,7 +2053,7 @@ dependencies = [ [[package]] name = "crucible-agent-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=65ca41e821ef53ec9c28909357f23e3348169e4f#65ca41e821ef53ec9c28909357f23e3348169e4f" +source = "git+https://github.com/oxidecomputer/crucible?rev=102b0bb8305cfbc3fa74c52d643d716653756372#102b0bb8305cfbc3fa74c52d643d716653756372" dependencies = [ "anyhow", "chrono", @@ -2082,7 +2082,7 @@ dependencies = [ [[package]] name = "crucible-common" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=65ca41e821ef53ec9c28909357f23e3348169e4f#65ca41e821ef53ec9c28909357f23e3348169e4f" +source = "git+https://github.com/oxidecomputer/crucible?rev=102b0bb8305cfbc3fa74c52d643d716653756372#102b0bb8305cfbc3fa74c52d643d716653756372" dependencies = [ "anyhow", "atty", @@ -2112,7 +2112,7 @@ dependencies = [ [[package]] name = "crucible-pantry-client" version = "0.0.1" -source = "git+https://github.com/oxidecomputer/crucible?rev=65ca41e821ef53ec9c28909357f23e3348169e4f#65ca41e821ef53ec9c28909357f23e3348169e4f" +source = "git+https://github.com/oxidecomputer/crucible?rev=102b0bb8305cfbc3fa74c52d643d716653756372#102b0bb8305cfbc3fa74c52d643d716653756372" dependencies = [ "anyhow", "chrono", @@ -2129,7 +2129,7 @@ dependencies = [ [[package]] name = "crucible-smf" version = "0.0.0" -source = "git+https://github.com/oxidecomputer/crucible?rev=65ca41e821ef53ec9c28909357f23e3348169e4f#65ca41e821ef53ec9c28909357f23e3348169e4f" +source = "git+https://github.com/oxidecomputer/crucible?rev=102b0bb8305cfbc3fa74c52d643d716653756372#102b0bb8305cfbc3fa74c52d643d716653756372" dependencies = [ "crucible-workspace-hack", "libc", diff --git a/Cargo.toml b/Cargo.toml index 7585d0c391..0c768b18f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -411,10 +411,10 @@ crossterm = { version = "0.29.0", features = ["event-stream"] } # NOTE: if you change the pinned revision of the `crucible` dependencies, you # must also update the references in package-manifest.toml to match the new # revision. -crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" } -crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" } -crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" } -crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "65ca41e821ef53ec9c28909357f23e3348169e4f" } +crucible-agent-client = { git = "https://github.com/oxidecomputer/crucible", rev = "102b0bb8305cfbc3fa74c52d643d716653756372" } +crucible-pantry-client = { git = "https://github.com/oxidecomputer/crucible", rev = "102b0bb8305cfbc3fa74c52d643d716653756372" } +crucible-smf = { git = "https://github.com/oxidecomputer/crucible", rev = "102b0bb8305cfbc3fa74c52d643d716653756372" } +crucible-common = { git = "https://github.com/oxidecomputer/crucible", rev = "102b0bb8305cfbc3fa74c52d643d716653756372" } # NOTE: See above! csv = "1.3.1" curve25519-dalek = "4" diff --git a/package-manifest.toml b/package-manifest.toml index 6d97caa407..c9ac7b105e 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -595,10 +595,10 @@ only_for_targets.image = "standard" # 3. Use source.type = "manual" instead of "prebuilt" source.type = "prebuilt" source.repo = "crucible" -source.commit = "65ca41e821ef53ec9c28909357f23e3348169e4f" +source.commit = "102b0bb8305cfbc3fa74c52d643d716653756372" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible.sha256.txt -source.sha256 = "7a19eda420ebd1126a25746c2198ed58a62647c755a375c746e84351e651b278" +source.sha256 = "5edb5f8b85002115bdf81bcfbbf3bb233b8ee560e1d315a8e2b9989ec9dc43fc" output.type = "zone" output.intermediate_only = true @@ -607,10 +607,10 @@ service_name = "crucible_pantry_prebuilt" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "crucible" -source.commit = "65ca41e821ef53ec9c28909357f23e3348169e4f" +source.commit = "102b0bb8305cfbc3fa74c52d643d716653756372" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-pantry.sha256.txt -source.sha256 = "e5dcf53aac3ddb5060663d2950837b3c4c81c68ede23b4ff5b1778cd1d4fb51e" +source.sha256 = "d0ec6e365cf9e918d7aa4711dc48b4eec9362b37d5becfa3133895dff801ceca" output.type = "zone" output.intermediate_only = true @@ -624,10 +624,10 @@ service_name = "crucible_dtrace" only_for_targets.image = "standard" source.type = "prebuilt" source.repo = "crucible" -source.commit = "65ca41e821ef53ec9c28909357f23e3348169e4f" +source.commit = "102b0bb8305cfbc3fa74c52d643d716653756372" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-dtrace.sha256.txt -source.sha256 = "4ec3f612b0c10ef3372e22e99ef8170ab39d198f394b0e51d6c1065dc7d01b40" +source.sha256 = "580fc58e717e245ea8a8171e25d7765edf58d57d3d9d190cdf61a4a1cae474be" output.type = "tarball" # Refer to