From 3ff45e9d8ae9003d929962e8452998020bcb4ba1 Mon Sep 17 00:00:00 2001 From: karencfv Date: Fri, 9 Feb 2024 14:38:04 +1300 Subject: [PATCH] Test using images from my branch --- package-manifest.toml | 12 ++++++------ smf/sled-agent/non-gimlet/config.toml | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/package-manifest.toml b/package-manifest.toml index 2e2674fb6b..65ea832f4f 100644 --- a/package-manifest.toml +++ b/package-manifest.toml @@ -418,24 +418,24 @@ only_for_targets.image = "standard" # 1. Build the zone image manually # 2. Copy the output zone image from crucible/out to omicron/out # 3. Use source.type = "manual" instead of "prebuilt" -source.type = "manual" +source.type = "prebuilt" source.repo = "crucible" -source.commit = "2d4bc11232d53f177c286383926fa5f8c1b2a938" +source.commit = "3e2bd7c5f79b59c66d848a6c19042394c28616ff" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible.sha256.txt -source.sha256 = "88ec93657a644e8f10a32d1d22cc027db901aea81027f49ce7bee58fc4a35755" +source.sha256 = "172c3ad4cbb836d6ef9af8d50a52eb6bc5fe7dad589b880c71a93bf9867a6188" output.type = "zone" output.intermediate_only = true [package.crucible-pantry] service_name = "crucible_pantry" only_for_targets.image = "standard" -source.type = "manual" +source.type = "prebuilt" source.repo = "crucible" -source.commit = "2d4bc11232d53f177c286383926fa5f8c1b2a938" +source.commit = "3e2bd7c5f79b59c66d848a6c19042394c28616ff" # The SHA256 digest is automatically posted to: # https://buildomat.eng.oxide.computer/public/file/oxidecomputer/crucible/image//crucible-pantry.sha256.txt -source.sha256 = "e2c3ed2d4cd6b5da3d38dd52df6d4a259280be7d45c30a363e9c71b174ecc6f8" +source.sha256 = "6a90cb0e3198cc2578aa2f4aa75016fed8f25511ccd0965f1bf7e8872c156616" output.type = "zone" output.intermediate_only = true diff --git a/smf/sled-agent/non-gimlet/config.toml b/smf/sled-agent/non-gimlet/config.toml index 432652c50b..2206c1eef8 100644 --- a/smf/sled-agent/non-gimlet/config.toml +++ b/smf/sled-agent/non-gimlet/config.toml @@ -16,7 +16,8 @@ sidecar_revision.soft_zone = { front_port_count = 1, rear_port_count = 1 } # Setting this to true causes sled-agent to always report that its time is # in-sync, rather than querying its NTP zone. -skip_timesync = false +# TODO: DON'T FORGET TO SET BACK TO FALSE BEFORE MERGING +skip_timesync = true # For testing purposes, A file-backed zpool can be manually created with the # following: