multicast e2e: merge main, update dendrite to multicast-e2e branch

Author: zeeshanlakhani

Cargo.lock

@@ -477,7 +477,7 @@ digest = "0.10.7"
 dns-server = { path = "dns-server" }
 dns-server-api = { path = "dns-server-api" }
 dns-service-client = { path = "clients/dns-service-client" }
-dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "c0bf0a3b536baab0393c96fec3204b32e4f9368b" }
+dpd-client = { git = "https://github.com/oxidecomputer/dendrite", rev = "e8a68118b5c2333f586d9bdcc4a1f63f2db98631", features = ["multicast"] }
 dropshot = { version = "0.16.6", features = [ "usdt-probes" ] }
 dropshot-api-manager = "0.6.0"
 dropshot-api-manager-types = "0.6.0"

Cargo.toml

@@ -8,6 +8,7 @@ license = "MPL-2.0"
 workspace = true
 
 [features]
+default = ["multicast"]
 multicast = []
 
 [build-dependencies]

nexus/Cargo.toml

@@ -9015,8 +9015,6 @@ pub async fn instance_simulate(nexus: &Arc<Nexus>, id: &InstanceUuid) {
 ///
 /// Returns an error instead of panicking if the sled agent communication fails.
 /// This is useful during test cleanup where the sled agent may be unavailable.
-// This is currently only consumed by tests behind the multicast feature gate.
-// If/when it has another consumer, this cfg can be removed.
 #[cfg(feature = "multicast")]
 pub async fn try_instance_simulate(
     nexus: &Arc<Nexus>,

nexus/tests/integration_tests/instances.rs

@@ -748,8 +748,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "c0bf0a3b536baab0393c96fec3204b32e4f9368b"
-source.sha256 = "28a7670be35a68ff3e52b3e5e57f4fa6b8465e3ec8a21314b09381fb213d3a3e"
+source.commit = "e8a68118b5c2333f586d9bdcc4a1f63f2db98631"
+source.sha256 = "cb5da43fe43e34adc627a8659cf8fc4474d87a8bac02d423530553a337d1e76e"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -775,8 +775,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "c0bf0a3b536baab0393c96fec3204b32e4f9368b"
-source.sha256 = "8070af15f48316ace21e6bb339ba4a1fb2219256a9a017cdbe85505f66aa08ad"
+source.commit = "e8a68118b5c2333f586d9bdcc4a1f63f2db98631"
+source.sha256 = "2095a9ce8a4a390a5fc8dda557483e50de8ec20c41cfe9d16ac3ab02765432b5"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -795,8 +795,8 @@ only_for_targets.image = "standard"
 # the other `source.*` keys.
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "c0bf0a3b536baab0393c96fec3204b32e4f9368b"
-source.sha256 = "69018db9c5f2d8878a8bc8dec26049679e8ece0e7d66e742c2e573c3484f8c29"
+source.commit = "e8a68118b5c2333f586d9bdcc4a1f63f2db98631"
+source.sha256 = "8343db98c696bcab03617010d0c4b57893cc511480b9201a9f9a62fa304e9fb8"
 output.type = "zone"
 output.intermediate_only = true
 

package-manifest.toml

@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="28a7670be35a68ff3e52b3e5e57f4fa6b8465e3ec8a21314b09381fb213d3a3e"
-CIDL_SHA256_LINUX_DPD="c68ea190f27e9526aa1fba1cc9d1416778d536c805c53c469ee62f603cc433fb"
-CIDL_SHA256_LINUX_SWADM="a2826dbdb9b3001cf35756e6ae77dbc9f43a5732932528a0b7cf482d0e0cb237"
+CIDL_SHA256_ILLUMOS="cb5da43fe43e34adc627a8659cf8fc4474d87a8bac02d423530553a337d1e76e"
+CIDL_SHA256_LINUX_DPD="d77fbe37f4ac0ccd302798030f5963b8299fa6b140e7be143e76eb9bb837eace"
+CIDL_SHA256_LINUX_SWADM="951b581f8b4915a8fe41867d26685a7c527099231690195157599516e685ce67"

tools/dendrite_stub_checksums

@@ -1 +1 @@
-COMMIT="c0bf0a3b536baab0393c96fec3204b32e4f9368b"
+COMMIT="e8a68118b5c2333f586d9bdcc4a1f63f2db98631"