From c2b90bc664ee957a3956a965b30f57413cde71e9 Mon Sep 17 00:00:00 2001
From: Nils Nieuwejaar <nils@oxidecomputer.com>
Date: Sat, 27 Jan 2024 00:31:58 -0500
Subject: [PATCH] Update dendrite commit (#4907)

Update progenitor to get clippy fix
Preserve switch zone logs in CI
---
 .github/buildomat/jobs/deploy.sh |  1 +
 Cargo.lock                       |  8 ++++----
 package-manifest.toml            | 12 ++++++------
 tools/dendrite_openapi_version   |  4 ++--
 tools/dendrite_stub_checksums    |  6 +++---
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.github/buildomat/jobs/deploy.sh b/.github/buildomat/jobs/deploy.sh
index e69cfb0078..5e43ff7f7c 100755
--- a/.github/buildomat/jobs/deploy.sh
+++ b/.github/buildomat/jobs/deploy.sh
@@ -5,6 +5,7 @@
 #: target = "lab-2.0-opte-0.28"
 #: output_rules = [
 #:  "%/var/svc/log/oxide-sled-agent:default.log*",
+#:  "%/zone/oxz_*/root/var/svc/log/oxide-*.log*",
 #:  "%/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*",
diff --git a/Cargo.lock b/Cargo.lock
index 7d7a8422c2..5309fac767 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6414,7 +6414,7 @@ dependencies = [
 [[package]]
 name = "progenitor"
 version = "0.5.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#2d3b9d0eb50a1907974c0b0ba7ee7893425b3e79"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#86b60220b88a2ca3629fb87acf8f83ff35f63aaa"
 dependencies = [
  "progenitor-client",
  "progenitor-impl",
@@ -6425,7 +6425,7 @@ dependencies = [
 [[package]]
 name = "progenitor-client"
 version = "0.5.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#2d3b9d0eb50a1907974c0b0ba7ee7893425b3e79"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#86b60220b88a2ca3629fb87acf8f83ff35f63aaa"
 dependencies = [
  "bytes",
  "futures-core",
@@ -6439,7 +6439,7 @@ dependencies = [
 [[package]]
 name = "progenitor-impl"
 version = "0.5.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#2d3b9d0eb50a1907974c0b0ba7ee7893425b3e79"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#86b60220b88a2ca3629fb87acf8f83ff35f63aaa"
 dependencies = [
  "getopts",
  "heck 0.4.1",
@@ -6461,7 +6461,7 @@ dependencies = [
 [[package]]
 name = "progenitor-macro"
 version = "0.5.0"
-source = "git+https://github.com/oxidecomputer/progenitor?branch=main#2d3b9d0eb50a1907974c0b0ba7ee7893425b3e79"
+source = "git+https://github.com/oxidecomputer/progenitor?branch=main#86b60220b88a2ca3629fb87acf8f83ff35f63aaa"
 dependencies = [
  "openapiv3",
  "proc-macro2",
diff --git a/package-manifest.toml b/package-manifest.toml
index f574f1ff5d..b08457e46c 100644
--- a/package-manifest.toml
+++ b/package-manifest.toml
@@ -497,8 +497,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "1c2f91a493c8b3c5fb7b853c570b2901ac3c22a7"
-source.sha256 = "052d97370515189465e4e835edb4a2d7e1e0b55ace0230ba18f045a03d975e80"
+source.commit = "fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
+source.sha256 = "1e24598ba77dc00682cdf54fc370696ef5aa49ed510ab7f72fcc91d61d679e7b"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -522,8 +522,8 @@ only_for_targets.image = "standard"
 # 2. Copy the output zone image from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "1c2f91a493c8b3c5fb7b853c570b2901ac3c22a7"
-source.sha256 = "3ebc1ee37c4d7a0657a78abbaad2fe81570da88128505bfdc4ea47e3e05c6277"
+source.commit = "fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
+source.sha256 = "720df8aff3aaa0f8a86ec606089ebf8b5068d7f3c243bd4c868b96ef72d13485"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -540,8 +540,8 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "1c2f91a493c8b3c5fb7b853c570b2901ac3c22a7"
-source.sha256 = "18079b2ce1003facb476e28499f2e31ebe092510ecd6c685fa1a91f1a34f2dda"
+source.commit = "fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
+source.sha256 = "5e34a10d9dca6c94f96075140d42b755dee1f5e6a3485fc239b12e12b89a30c5"
 output.type = "zone"
 output.intermediate_only = true
 
diff --git a/tools/dendrite_openapi_version b/tools/dendrite_openapi_version
index 6bda68c69d..56bcb2d9ff 100644
--- a/tools/dendrite_openapi_version
+++ b/tools/dendrite_openapi_version
@@ -1,2 +1,2 @@
-COMMIT="1c2f91a493c8b3c5fb7b853c570b2901ac3c22a7"
-SHA2="07d115bfa8498a8015ca2a8447efeeac32e24aeb25baf3d5e2313216e11293c0"
+COMMIT="fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
+SHA2="e8f73a83d5c62f7efce998f821acc80a91b7995c95bd9ec2c228372829310099"
diff --git a/tools/dendrite_stub_checksums b/tools/dendrite_stub_checksums
index de183cb496..497ce5c010 100644
--- a/tools/dendrite_stub_checksums
+++ b/tools/dendrite_stub_checksums
@@ -1,3 +1,3 @@
-CIDL_SHA256_ILLUMOS="052d97370515189465e4e835edb4a2d7e1e0b55ace0230ba18f045a03d975e80"
-CIDL_SHA256_LINUX_DPD="5c8bc252818897bc552a039f2423eb668d99e19ef54374644412c7aca533f94e"
-CIDL_SHA256_LINUX_SWADM="9d549fc3ebaf392961404b50e802ccb5e81e41e779ecc46166d49e5fb44b524f"
+CIDL_SHA256_ILLUMOS="1e24598ba77dc00682cdf54fc370696ef5aa49ed510ab7f72fcc91d61d679e7b"
+CIDL_SHA256_LINUX_DPD="4fc43b53a048264664ede64805d4d179ec32d50cf9ab1aaa0fa4e17190e511a2"
+CIDL_SHA256_LINUX_SWADM="0ab34a2063e68568aa064f7b71825a603d47b3e399f3e7f45976edb5d5283f0f"