i want propolis logs too please thank you

Author: iximeow

.github/buildomat/jobs/deploy.sh

@@ -9,11 +9,11 @@
 #:  "%/pool/ext/*/crypt/zone/oxz_*/root/var/svc/log/oxide-*.log*",
 #:  "%/pool/ext/*/crypt/zone/oxz_*/root/var/svc/log/system-illumos-*.log*",
 #:  "%/pool/ext/*/crypt/zone/oxz_ntp_*/root/var/log/chrony/*.log*",
-#:  "!/pool/ext/*/crypt/zone/oxz_propolis-server_*/root/var/svc/log/*.log*",
+#:  "%/pool/ext/*/crypt/zone/oxz_propolis-server_*/root/var/svc/log/*.log*",
 #:  "%/pool/ext/*/crypt/debug/global/oxide-sled-agent:default.log.*",
 #:  "%/pool/ext/*/crypt/debug/oxz_*/oxide-*.log.*",
 #:  "%/pool/ext/*/crypt/debug/oxz_*/system-illumos-*.log.*",
-#:  "!/pool/ext/*/crypt/debug/oxz_propolis-server_*/*.log.*",
+#:  "%/pool/ext/*/crypt/debug/oxz_propolis-server_*/*.log.*",
 #:  "/tmp/kstat/*.kstat"
 #: ]
 #: skip_clone = true

common/src/api/external/mod.rs

@@ -1298,6 +1298,12 @@ pub enum InstanceCpuPlatform {
     AmdMilan,
 
     /// An AMD Turin-like CPU platform.
+    // Note that there is only Turin, not Turin Dense - feature-wise there are
+    // collapsed together as the guest-visible platform is the same.
+    // If the two must be distinguished for instance placement, we'll want to
+    // track whatever the motivating constraint is more explicitly. CPU
+    // families, and especially the vendor code names, don't necessarily promise
+    // details about specific processor packaging choices.
     AmdTurin,
 }
 

nexus/db-model/src/sled_cpu_family.rs

@@ -41,6 +41,7 @@ impl SledCpuFamily {
             Self::Unknown => crate::VmmCpuPlatform::SledDefault,
             Self::AmdMilan => crate::VmmCpuPlatform::AmdMilan,
             Self::AmdTurin => crate::VmmCpuPlatform::AmdMilan,
+            Self::AmdTurinDense => crate::VmmCpuPlatform::AmdMilan,
         }
     }
 }

nexus/db-model/src/vmm_cpu_platform.rs

@@ -36,10 +36,12 @@ impl VmmCpuPlatform {
     pub fn compatible_sled_cpu_families(&self) -> Option<&[SledCpuFamily]> {
         match self {
             // Milan-based instances can run on both Milan and Turin processors.
+            // Turin and Turin Dense are equally viable from a features
+            // perspective.
             Self::AmdMilan => {
-                Some(&[SledCpuFamily::AmdMilan, SledCpuFamily::AmdTurin])
+                Some(&[SledCpuFamily::AmdMilan, SledCpuFamily::AmdTurin, SledCpuFamily::AmdTurinDense])
             }
-            Self::AmdTurin => Some(&[SledCpuFamily::AmdTurin]),
+            Self::AmdTurin => Some(&[SledCpuFamily::AmdTurin, SledCpuFamily::AmdTurinDense]),
 
             // VMMs get the "sled default" CPU platform when an instance starts
             // up on a sled that hasn't reported a well-known CPU family. Assume