Skip to content

Commit c2b90bc

Browse files
authored
Update dendrite commit (#4907)
Update progenitor to get clippy fix Preserve switch zone logs in CI
1 parent bd0ac96 commit c2b90bc

File tree

5 files changed

+16
-15
lines changed

5 files changed

+16
-15
lines changed

.github/buildomat/jobs/deploy.sh

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#: target = "lab-2.0-opte-0.28"
66
#: output_rules = [
77
#: "%/var/svc/log/oxide-sled-agent:default.log*",
8+
#: "%/zone/oxz_*/root/var/svc/log/oxide-*.log*",
89
#: "%/pool/ext/*/crypt/zone/oxz_*/root/var/svc/log/oxide-*.log*",
910
#: "%/pool/ext/*/crypt/zone/oxz_*/root/var/svc/log/system-illumos-*.log*",
1011
#: "%/pool/ext/*/crypt/zone/oxz_ntp_*/root/var/log/chrony/*.log*",

Cargo.lock

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-manifest.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -497,8 +497,8 @@ only_for_targets.image = "standard"
497497
# 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
498498
source.type = "prebuilt"
499499
source.repo = "dendrite"
500-
source.commit = "1c2f91a493c8b3c5fb7b853c570b2901ac3c22a7"
501-
source.sha256 = "052d97370515189465e4e835edb4a2d7e1e0b55ace0230ba18f045a03d975e80"
500+
source.commit = "fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
501+
source.sha256 = "1e24598ba77dc00682cdf54fc370696ef5aa49ed510ab7f72fcc91d61d679e7b"
502502
output.type = "zone"
503503
output.intermediate_only = true
504504

@@ -522,8 +522,8 @@ only_for_targets.image = "standard"
522522
# 2. Copy the output zone image from dendrite/out to omicron/out
523523
source.type = "prebuilt"
524524
source.repo = "dendrite"
525-
source.commit = "1c2f91a493c8b3c5fb7b853c570b2901ac3c22a7"
526-
source.sha256 = "3ebc1ee37c4d7a0657a78abbaad2fe81570da88128505bfdc4ea47e3e05c6277"
525+
source.commit = "fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
526+
source.sha256 = "720df8aff3aaa0f8a86ec606089ebf8b5068d7f3c243bd4c868b96ef72d13485"
527527
output.type = "zone"
528528
output.intermediate_only = true
529529

@@ -540,8 +540,8 @@ only_for_targets.image = "standard"
540540
# 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
541541
source.type = "prebuilt"
542542
source.repo = "dendrite"
543-
source.commit = "1c2f91a493c8b3c5fb7b853c570b2901ac3c22a7"
544-
source.sha256 = "18079b2ce1003facb476e28499f2e31ebe092510ecd6c685fa1a91f1a34f2dda"
543+
source.commit = "fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
544+
source.sha256 = "5e34a10d9dca6c94f96075140d42b755dee1f5e6a3485fc239b12e12b89a30c5"
545545
output.type = "zone"
546546
output.intermediate_only = true
547547

tools/dendrite_openapi_version

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
COMMIT="1c2f91a493c8b3c5fb7b853c570b2901ac3c22a7"
2-
SHA2="07d115bfa8498a8015ca2a8447efeeac32e24aeb25baf3d5e2313216e11293c0"
1+
COMMIT="fd159136c552d8b4ec4d49dd9bae7e38f6a636e6"
2+
SHA2="e8f73a83d5c62f7efce998f821acc80a91b7995c95bd9ec2c228372829310099"

tools/dendrite_stub_checksums

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
CIDL_SHA256_ILLUMOS="052d97370515189465e4e835edb4a2d7e1e0b55ace0230ba18f045a03d975e80"
2-
CIDL_SHA256_LINUX_DPD="5c8bc252818897bc552a039f2423eb668d99e19ef54374644412c7aca533f94e"
3-
CIDL_SHA256_LINUX_SWADM="9d549fc3ebaf392961404b50e802ccb5e81e41e779ecc46166d49e5fb44b524f"
1+
CIDL_SHA256_ILLUMOS="1e24598ba77dc00682cdf54fc370696ef5aa49ed510ab7f72fcc91d61d679e7b"
2+
CIDL_SHA256_LINUX_DPD="4fc43b53a048264664ede64805d4d179ec32d50cf9ab1aaa0fa4e17190e511a2"
3+
CIDL_SHA256_LINUX_SWADM="0ab34a2063e68568aa064f7b71825a603d47b3e399f3e7f45976edb5d5283f0f"

0 commit comments

Comments
 (0)